This validation test is identical to diff --git a/BuildingSystems/Fluid/FMI/Conversion/Validation/InletToAirDryAirCO2.mo b/BuildingSystems/Fluid/FMI/Conversion/Validation/InletToAirDryAirCO2.mo index b09bc0bd..28e6e517 100644 --- a/BuildingSystems/Fluid/FMI/Conversion/Validation/InletToAirDryAirCO2.mo +++ b/BuildingSystems/Fluid/FMI/Conversion/Validation/InletToAirDryAirCO2.mo @@ -2,7 +2,7 @@ within BuildingSystems.Fluid.FMI.Conversion.Validation; model InletToAirDryAirCO2 "Validation model for inlet to air with dry air medium and CO2" extends BuildingSystems.Fluid.FMI.Conversion.Validation.InletToAirMoistAirCO2( - redeclare package Medium = Modelica.Media.Air.SimpleAir(extraPropertiesNames={"CO2"})); + redeclare replaceable package Medium = Modelica.Media.Air.SimpleAir(extraPropertiesNames={"CO2"})); annotation (Documentation(info="
This validation test is identical to
diff --git a/BuildingSystems/Fluid/FMI/Conversion/Validation/InletToAirMoistAirCO2.mo b/BuildingSystems/Fluid/FMI/Conversion/Validation/InletToAirMoistAirCO2.mo
index 76de9fe8..454f8079 100644
--- a/BuildingSystems/Fluid/FMI/Conversion/Validation/InletToAirMoistAirCO2.mo
+++ b/BuildingSystems/Fluid/FMI/Conversion/Validation/InletToAirMoistAirCO2.mo
@@ -2,7 +2,7 @@ within BuildingSystems.Fluid.FMI.Conversion.Validation;
model InletToAirMoistAirCO2
"Validation model for inlet to BuildingSystems.Media.Air conversion with C02 trace substances"
extends BuildingSystems.Fluid.FMI.Conversion.Validation.InletToAirDryAir(
- redeclare package Medium = BuildingSystems.Media.Air(extraPropertiesNames={"CO2"}));
+ redeclare replaceable package Medium = BuildingSystems.Media.Air(extraPropertiesNames={"CO2"}));
Modelica.Blocks.Sources.Constant CRev[Medium.nC](each k=0.8)
"Trace substance for reverse flow"
annotation (Placement(transformation(extent={{92,-80},{72,-60}})));
diff --git a/BuildingSystems/Fluid/Sensors/TemperatureTwoPort.mo b/BuildingSystems/Fluid/Sensors/TemperatureTwoPort.mo
index e8a96fb9..29ddc1b9 100644
--- a/BuildingSystems/Fluid/Sensors/TemperatureTwoPort.mo
+++ b/BuildingSystems/Fluid/Sensors/TemperatureTwoPort.mo
@@ -28,7 +28,9 @@ model TemperatureTwoPort "Ideal two port temperature sensor"
protected
parameter Real tauHeaTraInv(final unit = "1/s")=
if tauHeaTra<1E-10 then 0 else 1/tauHeaTra
- "Dummy parameter to avoid division by tauLoss";
+ "Dummy parameter to avoid division by tauHeaTra";
+ parameter Real ratTau = if dynamic then tauHeaTra/tau else 1
+ "Ratio of tau";
Medium.Temperature TMed(start=T_start)
"Medium temperature to which the sensor is exposed";
Medium.Temperature T_a_inflow "Temperature of inflowing fluid at port_a";
@@ -63,7 +65,7 @@ equation
// Output signal of sensor
if dynamic then
if transferHeat then
- der(T) = (TMed-T)*k*tauInv + (TAmb-T)*tauHeaTraInv;
+ der(T) = (TMed-T)*k*tauInv + (TAmb-T)*tauHeaTraInv/(ratTau*k+1);
else
der(T) = (TMed-T)*k*tauInv;
end if;
@@ -134,7 +136,8 @@ BuildingSystems.Fluid.Sensors.UsersGuide for an explanation.
If transferHeat = true, then heat transfer with the ambient is
approximated and T converges towards the fixed ambient
temperature TAmb using a first order approximation
-with a time constant of tauHeaTra.
+with a time constant of tauHeaTra
+when the flow rate is small.
Note that no energy is exchanged with the fluid as the
sensor does not influence the fluid temperature.
transferHeat=false.
", revisions="
transferHeat=true.
+See #840.
+tauInv
since this now exists in
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_BaseClasses_Examples_PowerLaw.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_BaseClasses_Examples_PowerLaw.txt
deleted file mode 100644
index 7b2483a8..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_BaseClasses_Examples_PowerLaw.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-V_flow=[-2., -1.97989892914392218159, -1.95959174541680547499, -1.9390718923073257951, -1.91833257488541542024, -1.89736664452093228839, -1.87616634082645505899, -1.85472369258230185274, -1.833030219939808525, -1.81107700659977233215, -1.78885436390826457753, -1.76635217531473909247, -1.74355959276111072143, -1.72046505294755402993, -1.69705629489047704617, -1.67332006923581344537, -1.64924227322717675825, -1.62480771981136307147, -1.60000004169548692978, -1.57480155815100686389, -1.5491933899452008383, -1.52315459910803907562, -1.49666297116585345073, -1.46969391048918218701, -1.44222055374983604281, -1.41421353816986083984, -1.38562008952243242987, -1.35627618638185443167, -1.32593465218643968839, -1.29430100585865481833, -1.26105312582658135589, -1.22585917378706854564, -1.18839320733562159305, -1.14834826619644014833, -1.10544695047274998956, -1.05945178989212362985, -1.01017196268710551799, -0.95746799902790258319, -0.90125748713961628678, -0.84151604864664775185, -0.77827910460035099049, -0.71164063145494804719, -0.64175274500154588786, -0.56882261568693259779, -0.49310804551733333767, -0.41491433437847313748, -0.33458832712495251149, -0.25251184905201889963, -0.16909661814442766836, -0.08477658648507006844, 0., 0.08477658648386821039, 0.16909686822213404467, 0.25251209548418174222, 0.33458808470976719729, 0.41491433437988628485, 0.49310804551705927912, 0.56882261568614256309, 0.64175295781698415976, 0.71164083424084856322, 0.77827891040569496806, 0.84151604864796614169, 0.90125748714003084405, 0.95746799902751822398, 1.01017196268602638121, 1.05945193119472569343, 1.10544681741086092686, 1.14834814261907003363, 1.18839320733603726055, 1.22585917378719644333, 1.26105312582597761661, 1.29430110216929428191, 1.32593455963322326419, 1.35627609749263799976, 1.38562008952284476671, 1.41421353816986083984, 1.44222059505569522031, 1.46969395096883603813, 1.49666305068395066868, 1.52315455990920511908, 1.54919335143254577325, 1.57480155815091671379, 1.6000000416952206983, 1.62480775643915542616, 1.64924234542681835691, 1.67331999793384489372, 1.69705625972312956762, 1.72046505294771945316, 1.74355960984756541698, 1.76635220901871248245, 1.7888544138247735038, 1.81107694071711589068, 1.83303018738512601971, 1.85472367649692282399, 1.87616634876628429751, 1.89736666805501519306, 1.91833262144480087841, 1.93907183461280929748, 1.95959170735679921727, 1.97989891030987008591, 2.]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_BaseClasses_Examples_PowerLawFixedM.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_BaseClasses_Examples_PowerLawFixedM.txt
deleted file mode 100644
index 7b2483a8..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_BaseClasses_Examples_PowerLawFixedM.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-V_flow=[-2., -1.97989892914392218159, -1.95959174541680547499, -1.9390718923073257951, -1.91833257488541542024, -1.89736664452093228839, -1.87616634082645505899, -1.85472369258230185274, -1.833030219939808525, -1.81107700659977233215, -1.78885436390826457753, -1.76635217531473909247, -1.74355959276111072143, -1.72046505294755402993, -1.69705629489047704617, -1.67332006923581344537, -1.64924227322717675825, -1.62480771981136307147, -1.60000004169548692978, -1.57480155815100686389, -1.5491933899452008383, -1.52315459910803907562, -1.49666297116585345073, -1.46969391048918218701, -1.44222055374983604281, -1.41421353816986083984, -1.38562008952243242987, -1.35627618638185443167, -1.32593465218643968839, -1.29430100585865481833, -1.26105312582658135589, -1.22585917378706854564, -1.18839320733562159305, -1.14834826619644014833, -1.10544695047274998956, -1.05945178989212362985, -1.01017196268710551799, -0.95746799902790258319, -0.90125748713961628678, -0.84151604864664775185, -0.77827910460035099049, -0.71164063145494804719, -0.64175274500154588786, -0.56882261568693259779, -0.49310804551733333767, -0.41491433437847313748, -0.33458832712495251149, -0.25251184905201889963, -0.16909661814442766836, -0.08477658648507006844, 0., 0.08477658648386821039, 0.16909686822213404467, 0.25251209548418174222, 0.33458808470976719729, 0.41491433437988628485, 0.49310804551705927912, 0.56882261568614256309, 0.64175295781698415976, 0.71164083424084856322, 0.77827891040569496806, 0.84151604864796614169, 0.90125748714003084405, 0.95746799902751822398, 1.01017196268602638121, 1.05945193119472569343, 1.10544681741086092686, 1.14834814261907003363, 1.18839320733603726055, 1.22585917378719644333, 1.26105312582597761661, 1.29430110216929428191, 1.32593455963322326419, 1.35627609749263799976, 1.38562008952284476671, 1.41421353816986083984, 1.44222059505569522031, 1.46969395096883603813, 1.49666305068395066868, 1.52315455990920511908, 1.54919335143254577325, 1.57480155815091671379, 1.6000000416952206983, 1.62480775643915542616, 1.64924234542681835691, 1.67331999793384489372, 1.69705625972312956762, 1.72046505294771945316, 1.74355960984756541698, 1.76635220901871248245, 1.7888544138247735038, 1.81107694071711589068, 1.83303018738512601971, 1.85472367649692282399, 1.87616634876628429751, 1.89736666805501519306, 1.91833262144480087841, 1.93907183461280929748, 1.95959170735679921727, 1.97989891030987008591, 2.]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_BaseClasses_Examples_WindPressureLowRise.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_BaseClasses_Examples_WindPressureLowRise.txt
deleted file mode 100644
index 49e89d1c..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_BaseClasses_Examples_WindPressureLowRise.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-Cp=[0.60000002384185791016, 0.56194221193063653708, 0.46909204623699840564, 0.315991810403125295, 0.09886423215940000342, -0.17272251949703876228, -0.45518064101772726104, -0.64909017682695457907, -0.66663850196645013657, -0.55029093433761244736, -0.39771607927983065878, -0.27312949135696829028, -0.21662364399872430232, -0.21662364399872430232, -0.27312949135696829028, -0.39771607927983065878, -0.55029093433761244736, -0.66663850196645046964, -0.64909017682695457907, -0.45518064101772726104, -0.17272251949703876228, 0.09886423215939860176, 0.315991810403125295, 0.46909204623699840564, 0.56194221193063653708, 0.60000002384185791016, 0.56194231173397746204, 0.46909186868936414427, 0.315991810403125295, 0.09886460225855400741, -0.17272294755638076258, -0.45518064101772726104, -0.64909017682695457907, -0.6666384197386678867, -0.5502909343376116702, -0.39771607927983065878, -0.27312933865949445833, -0.21662364399872430232, -0.21662363429995992736, -0.27312933865949445833, -0.39771618680495696152, -0.5502909343376116702, -0.6666384197386678867, -0.64909010738557060272, -0.45518073800540626017, -0.17272283981612054915, 0.09886442094576697315, 0.3159917762497990168, 0.46909191632809427164, 0.56194227775895400079, 0.60000002384185791016, 0.56194227775895400079, 0.46909191632809427164, 0.3159917762497990168, 0.09886442094576557149, -0.17272283981612213122, -0.45518073800540764795, -0.64909010738556982556, -0.66663841973866833079, -0.55029093433761244736, -0.39771618680495696152, -0.27312933865949445833, -0.21662363429995992736, -0.21662364399872430232, -0.27312933865949445833, -0.39771607927983065878, -0.55029093433761244736, -0.66663841973866833079, -0.64909017682695402396, -0.45518064101772875985, -0.1727229475563823724, 0.09886460225855266126, 0.315991810403125295, 0.46909186868936414427, 0.56194231173397746204, 0.60000002384185791016, 0.56194221193063653708, 0.46909204623699840564, 0.315991810403125295, 0.09886423215939860176, -0.17272251949704034435, -0.45518064101772875985, -0.64909017682695402396, -0.66663850196645046964, -0.55029093433761244736, -0.39771607927983065878, -0.27312949135696829028, -0.21662364399872430232, -0.21662364399872430232, -0.27312949135696829028, -0.39771607927983065878, -0.55029093433761244736, -0.66663850196645046964, -0.64909017682695402396, -0.45518064101772875985, -0.17272251949704034435, 0.09886423215939860176, 0.315991810403125295, 0.46909204623699840564, 0.56194221193063653708, 0.60000002384185791016]
-time=[-2., 2.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_CO2TransportStep.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_CO2TransportStep.txt
deleted file mode 100644
index 89747a21..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_CO2TransportStep.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'number of continuous time states': '18', 'linear': ' '}
-CO2SenWes.C=[0., 0., 0., 0., 0., 0.0000001444770703074, 0.00000018205216179012, 0.00000016622587395432, 0.0000001496235029208, 0.00000014355917699049, 0.0000001328426009195, 0.00000012406749760885, 0.00000011630327634293, 0.0000001092343850928, 0.00000010254525051323, 0.00000009626726438228, 0.00000009050607729932, 0.00000008516595073615, 0.00000008022059461155, 0.0000000756437259497, 0.00000007140906177483, 0.00000006749031911113, 0.00000006386120787738, 0.00000006049543799236, 0.0000000573667335857, 0.00000005449427575854, 0.00000005183231266415, 0.00000004933377439897, 0.00000004699163724808, 0.00000004479887749653, 0.0000000427484785348, 0.00000004083341309524, 0.0000000390466574629, 0.00000003738119147556, 0.00000003582999497098, 0.0000000343860371288, 0.00000003304230489221, 0.00000003179176744084, 0.00000003062740816517, 0.00000002954219979756, 0.00000002852912217577, 0.00000002758115158485, 0.00000002669126608623, 0.00000002585244374131, 0.00000002505766083516, 0.00000002431717405216, 0.00000002364483187023, 0.00000002299804435779, 0.00000002237614715739, 0.00000002177847591156, 0.00000002120436803921, 0.00000002065315918287, 0.00000002012418320874, 0.0000000196167775357, 0.00000001913027780631, 0.00000001866402143946, 0.00000001821734052498, 0.00000001778957425813, 0.00000001738005650509, 0.00000001698812468476, 0.00000001661311266332, 0.00000001625435963604, 0.00000001591119769273, 0.00000001558296602866, 0.00000001526899851001, 0.00000001496863077932, 0.00000001468119936732, 0.00000001440604080472, 0.00000001414248984588, 0.00000001388988302153, 0.00000001364755597422, 0.00000001341484523465, 0.0000000131910855572, 0.00000001297561347258, 0.00000001276776462333, 0.00000001256687465201, 0.00000001237228008932, 0.00000001218331657782, 0.00000001199931976004, 0.00000001181962527852, 0.00000001164356966399, 0.00000001147048855898, 0.00000001129971760605, 0.00000001113059333591, 0.00000001096245050292, 0.0000000107946256378, 0.00000001062797849727, 0.00000001046477482447, 0.00000001030494178877, 0.00000001014838257873, 0.00000000999500127108, 0.00000000984470194254, 0.00000000969738866985, 0.0000000095529628652, 0.00000000941133038168, 0.00000000927239351967, 0.00000000913605635589, 0.00000000900222296707, 0.00000000887079565359, 0.00000000874167938036, 0.00000000861477644776]
-CO2SenEas.C=[0., 0., 0., 0., 0., 0.00000022682017686293, 0.00000016401649816089, 0.00000015675853148878, 0.00000015204204828478, 0.00000013836893231201, 0.00000013087203853956, 0.00000012279699035389, 0.00000011497983365416, 0.00000010764377833539, 0.00000010101203429258, 0.00000009499635211796, 0.000000089357286015, 0.00000008411805652031, 0.00000007925596889891, 0.00000007474833552124, 0.00000007057247586317, 0.00000006670570229517, 0.00000006312533429309, 0.00000005980867712196, 0.00000005673304670495, 0.00000005391029489488, 0.00000005128936564347, 0.00000004882903681391, 0.00000004652240903624, 0.00000004436259359863, 0.00000004234269468384, 0.0000000404558164746, 0.00000003869507025911, 0.0000000370535602201, 0.00000003552439409304, 0.0000000341006796134, 0.00000003277552096392, 0.00000003154202232736, 0.0000000303932985446, 0.00000002932244669296, 0.00000002832258161334, 0.00000002738680393577, 0.00000002650822317207, 0.00000002567994705771, 0.00000002489507977543, 0.0000000241636488596, 0.00000002349913685862, 0.00000002285979405769, 0.00000002224496498116, 0.00000002165399770604, 0.00000002108624030939, 0.00000002054103553917, 0.00000002001773324878, 0.0000000195156797389, 0.00000001903422131022, 0.00000001857270426342, 0.00000001813047489918, 0.00000001770688129454, 0.00000001730126975019, 0.00000001691298479045, 0.00000001654137626872, 0.00000001618578870932, 0.0000000158455701893, 0.00000001552006700933, 0.00000001520862547011, 0.00000001491059187231, 0.00000001462531340479, 0.00000001435213636825, 0.00000001409040795153, 0.0000000138394753435, 0.00000001359868395667, 0.0000000133673809799, 0.00000001314491271387, 0.00000001293062723562, 0.00000001272386995765, 0.00000001252398718066, 0.00000001233032698167, 0.00000001214223477319, 0.00000001195905774409, 0.00000001178014219505, 0.00000001160483620311, 0.00000001143248518076, 0.0000000112624354287, 0.00000001109403413579, 0.00000001092662849089, 0.00000001075956479468, 0.00000001059368681666, 0.00000001043122122013, 0.00000001027209783899, 0.00000001011622074998, 0.000000009963494918, 0.00000000981382530796, 0.00000000966711777295, 0.00000000952327550152, 0.00000000938220434676, 0.00000000924380927358, 0.00000000910799524689, 0.00000000897466634342, 0.00000000884372841625, 0.0000000087150864303, 0.00000000858864357411]
-CO2SenTop.C=[0., 0., 0., 0., 0., 0.00000000458930005109, 0.00000000882905659694, 0.00000001280101979972, 0.00000001640133362457, 0.00000001963020324069, 0.0000000225542571286, 0.0000000251853649047, 0.00000002754755712431, 0.0000000296622033602, 0.00000003155067318517, 0.0000000332252518831, 0.00000003471496157204, 0.00000003603599552093, 0.00000003719910424138, 0.00000003821503824497, 0.00000003909454093787, 0.00000003984836283166, 0.00000004048725443795, 0.0000000410219627156, 0.00000004146323462351, 0.00000004180408552656, 0.00000004206582104871, 0.00000004226787098105, 0.00000004241318407594, 0.00000004250472329659, 0.00000004254543028992, 0.00000004253826801914, 0.0000000424861816839, 0.00000004239213069468, 0.00000004225906735655, 0.00000004208994042187, 0.00000004188770574842, 0.00000004165531919398, 0.0000000413957295109, 0.00000004111189255696, 0.00000004080676418994, 0.00000004048328960948, 0.00000004014442822609, 0.00000003979313234481, 0.00000003943235071802, 0.00000003905785916913, 0.00000003866378861517, 0.00000003826772854154, 0.00000003786987434751, 0.00000003747042143232, 0.00000003706956164251, 0.00000003666749748277, 0.00000003626441724691, 0.00000003586051988691, 0.0000000354559972493, 0.00000003505104828605, 0.00000003464586839641, 0.00000003424064942692, 0.00000003383559032955, 0.00000003343088650354, 0.00000003302672624272, 0.0000000326233156045, 0.00000003222084288268, 0.00000003181950347653, 0.000000031419496338, 0.00000003102101331365, 0.00000003062424980271, 0.00000003022940475716, 0.00000002983667002354, 0.00000002944624277745, 0.00000002905831664179, 0.00000002867308879217, 0.00000002829075285149, 0.00000002791150599535, 0.00000002753554007029, 0.00000002716305402828, 0.00000002679424149221, 0.00000002642929786134, 0.00000002606842031128, 0.00000002571180068855, 0.00000002535963616879, 0.00000002501212392758, 0.00000002466945581148, 0.00000002433182899608, 0.00000002399943710429, 0.00000002367247731172, 0.00000002335053927993, 0.00000002303256252389, 0.0000000227185061874, 0.00000002240834007239, 0.00000002210203930986, 0.00000002179957725446, 0.00000002150092726083, 0.00000002120606445999, 0.00000002091496220658, 0.00000002062759207888, 0.00000002034393098427, 0.00000002006395050103, 0.00000001978762576016, 0.00000001951493011632, 0.00000001924583692414]
-time=[0., 86400.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_ChimneyShaftNoVolume.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_ChimneyShaftNoVolume.txt
deleted file mode 100644
index d1cc6a72..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_ChimneyShaftNoVolume.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-last-generated=2017-03-10
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1",
- "number of continuous time states": "5",
- "linear": "0"
-}
-bou0.T=[2.731499938964844e+02, 2.731499938964844e+02]
-roo.T=[2.931499938964844e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931413879394531e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410217285156e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.931361389160156e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02]
-time=[0e+00, 3.6e+03]
-oriBot.m_flow=[6.112581118941307e-02, -2.835682779550552e-02, -2.83579807728529e-02, -2.835790812969208e-02, -2.835792675614357e-02, -2.835792116820812e-02, -2.835792116820812e-02, -2.835792303085327e-02, -2.835792116820812e-02, -2.835792303085327e-02, -2.835792489349842e-02, -2.835792489349842e-02, -2.835792303085327e-02, -2.835792303085327e-02, -2.835792303085327e-02, -2.835792303085327e-02, -2.835792303085327e-02, 6.656884681433439e-03, 6.646633613854647e-03, 6.646613590419292e-03, 6.646614521741867e-03, 6.64661405608058e-03, 6.646614521741867e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 7.131564896553755e-03, 2.837003953754902e-02, 2.836988307535648e-02, 2.837013453245163e-02, 2.837000973522663e-02, 2.83699743449688e-02, 2.836999669671059e-02, 2.837000042200089e-02, 2.836999297142029e-02, 2.836998738348484e-02, 2.836999297142029e-02, 2.836999297142029e-02, 2.836999297142029e-02, 2.836999297142029e-02, 2.836999297142029e-02, 2.836999297142029e-02, 2.836999297142029e-02, -6.786792539060116e-03, -6.613634526729584e-03, -6.613733246922493e-03, -6.613761652261019e-03, -6.613752339035273e-03, -6.613753736019135e-03, -6.613755133002996e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03]
-oriChiTop.m_flow=[-4.397496953606606e-02, 2.164136245846748e-02, 2.164211496710777e-02, 2.164206653833389e-02, 2.164207957684994e-02, 2.164207585155964e-02, 2.164207585155964e-02, 2.164207585155964e-02, 2.164207585155964e-02, 2.164207771420479e-02, 2.164207771420479e-02, 2.164207771420479e-02, 2.164207771420479e-02, 2.164207771420479e-02, 2.164207585155964e-02, 2.164207585155964e-02, 2.164207771420479e-02, 6.641538813710213e-03, 6.646604742854834e-03, 6.646614521741867e-03, 6.64661405608058e-03, 6.646614521741867e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.390338763594627e-03, -2.163003943860531e-02, -2.162993513047695e-02, -2.163010090589523e-02, -2.163001894950867e-02, -2.162999659776688e-02, -2.163001149892807e-02, -2.163001336157322e-02, -2.163000777363777e-02, -2.163000404834747e-02, -2.163000777363777e-02, -2.163000777363777e-02, -2.163000777363777e-02, -2.163000777363777e-02, -2.163000777363777e-02, -2.163000777363777e-02, -2.163000777363777e-02, -6.524340715259314e-03, -6.613814737647772e-03, -6.61376491189003e-03, -6.613750476390123e-03, -6.613755133002996e-03, -6.613754667341709e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03]
-oriChiBot.m_flow=[-4.397496953606606e-02, 2.164136245846748e-02, 2.164211496710777e-02, 2.164206653833389e-02, 2.164207957684994e-02, 2.164207585155964e-02, 2.164207585155964e-02, 2.164207585155964e-02, 2.164207585155964e-02, 2.164207771420479e-02, 2.164207771420479e-02, 2.164207771420479e-02, 2.164207771420479e-02, 2.164207771420479e-02, 2.164207585155964e-02, 2.164207585155964e-02, 2.164207771420479e-02, 6.641538813710213e-03, 6.646604742854834e-03, 6.646614521741867e-03, 6.64661405608058e-03, 6.646614521741867e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.64661405608058e-03, 6.390338763594627e-03, -2.163003943860531e-02, -2.162993513047695e-02, -2.163010090589523e-02, -2.163001894950867e-02, -2.162999659776688e-02, -2.163001149892807e-02, -2.163001336157322e-02, -2.163000777363777e-02, -2.163000404834747e-02, -2.163000777363777e-02, -2.163000777363777e-02, -2.163000777363777e-02, -2.163000777363777e-02, -2.163000777363777e-02, -2.163000777363777e-02, -2.163000777363777e-02, -6.524340715259314e-03, -6.613814737647772e-03, -6.61376491189003e-03, -6.613750476390123e-03, -6.613755133002996e-03, -6.613754667341709e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03, -6.613754201680422e-03]
-con.u_m=[2.931499938964844e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931413879394531e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410217285156e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.930831909179688e+02, 2.931361389160156e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02]
-con.u_s=[2.931499938964844e+02, 2.931499938964844e+02]
-con.y=[2.842170943040401e-13, -1.879480405477807e-04, -6.255593689274974e-06, 1.072969780580024e-06, -3.589389052649494e-07, 8.623970870758058e-08, 7.776321808705688e-08, -5.246732825980876e-08, -1.825384288167697e-08, -2.070805749099236e-09, 5.488800525199622e-09, 6.787388429074781e-09, 4.188507318758639e-09, 5.542233338928781e-11, -3.248885604989485e-09, -3.36058292305097e-09, -1.153921402874403e-10, 4.310891777276993e-02, 4.452951997518539e-02, 4.453243315219879e-02, 4.45324219763279e-02, 4.453242570161819e-02, 4.45324070751667e-02, 4.45324145257473e-02, 4.45324182510376e-02, 4.45324182510376e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.45324145257473e-02, 4.483398422598839e-02, 3.339699506759644e-01, 3.340350389480591e-01, 3.340307772159576e-01, 3.340306878089905e-01, 3.340303599834442e-01, 3.340305089950562e-01, 3.340305387973785e-01, 3.340305089950562e-01, 3.340304791927338e-01, 3.340304791927338e-01, 3.340305089950562e-01, 3.340305089950562e-01, 3.340305089950562e-01, 3.340305089950562e-01, 3.340305089950562e-01, 3.340305089950562e-01, 6.924689561128616e-02, 4.429522901773453e-02, 4.430937021970749e-02, 4.431337863206863e-02, 4.431210085749626e-02, 4.431227222084999e-02, 4.43124957382679e-02, 4.431236907839775e-02, 4.431233182549477e-02, 4.431232810020447e-02, 4.431234300136566e-02, 4.431235790252686e-02, 4.431236162781715e-02, 4.431235417723656e-02, 4.431235045194626e-02, 4.431235045194626e-02, 4.431235045194626e-02, 4.431235045194626e-02, 4.431235045194626e-02, 4.431235045194626e-02, 4.431235045194626e-02, 4.431235045194626e-02, 4.431235045194626e-02, 4.431235045194626e-02, 4.431235045194626e-02, 4.431235045194626e-02, 4.431235045194626e-02, 4.431235045194626e-02, 4.431235045194626e-02, 4.431235045194626e-02, 4.431235045194626e-02, 4.431235045194626e-02, 4.431235045194626e-02, 4.431235045194626e-02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_ChimneyShaftWithVolume.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_ChimneyShaftWithVolume.txt
deleted file mode 100644
index d457aa41..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_ChimneyShaftWithVolume.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-last-generated=2017-03-10
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "9",
- "linear": " "
-}
-sha.vol.T=[2.931499938964844e+02, 2.931372985839844e+02, 2.931397705078125e+02, 2.931417541503906e+02, 2.931433715820312e+02, 2.931446533203125e+02, 2.931456909179688e+02, 2.931465148925781e+02, 2.93147216796875e+02, 2.931477661132812e+02, 2.93148193359375e+02, 2.931485290527344e+02, 2.931488342285156e+02, 2.931490478515625e+02, 2.931492309570312e+02, 2.931493835449219e+02, 2.931495056152344e+02, 2.931460571289062e+02, 2.931457214355469e+02, 2.931454467773438e+02, 2.931451721191406e+02, 2.931448974609375e+02, 2.931446533203125e+02, 2.931444396972656e+02, 2.931442260742188e+02, 2.931440124511719e+02, 2.931438293457031e+02, 2.931436462402344e+02, 2.931434936523438e+02, 2.931433410644531e+02, 2.931431884765625e+02, 2.9314306640625e+02, 2.931429138183594e+02, 2.93142822265625e+02, 2.931427001953125e+02, 2.93142578125e+02, 2.931424865722656e+02, 2.931423950195312e+02, 2.93142333984375e+02, 2.931422424316406e+02, 2.931421813964844e+02, 2.9314208984375e+02, 2.931420288085938e+02, 2.931419677734375e+02, 2.931419067382812e+02, 2.93141845703125e+02, 2.931418151855469e+02, 2.931417541503906e+02, 2.931417236328125e+02, 2.931416931152344e+02, 2.931416320800781e+02, 2.895900573730469e+02, 2.865791320800781e+02, 2.840927734375e+02, 2.820476379394531e+02, 2.80374267578125e+02, 2.790057678222656e+02, 2.778887329101562e+02, 2.769832153320312e+02, 2.762498779296875e+02, 2.756551818847656e+02, 2.751703491210938e+02, 2.747790222167969e+02, 2.744647827148438e+02, 2.742113037109375e+02, 2.740057067871094e+02, 2.738398132324219e+02, 2.737368774414062e+02, 2.737005310058594e+02, 2.736663513183594e+02, 2.736342468261719e+02, 2.736040649414062e+02, 2.735757446289062e+02, 2.735491333007812e+02, 2.73524169921875e+02, 2.73500732421875e+02, 2.734787292480469e+02, 2.734580993652344e+02, 2.734387512207031e+02, 2.734205627441406e+02, 2.734035034179688e+02, 2.733875122070312e+02, 2.733724975585938e+02, 2.733584594726562e+02, 2.733452758789062e+02, 2.733329467773438e+02, 2.733213806152344e+02, 2.73310546875e+02, 2.733004150390625e+02, 2.732908935546875e+02, 2.732819519042969e+02, 2.732735595703125e+02, 2.732656860351562e+02, 2.732583312988281e+02, 2.732514343261719e+02, 2.732449645996094e+02, 2.732389526367188e+02, 2.732333068847656e+02, 2.732279968261719e+02, 2.732230529785156e+02, 2.732184143066406e+02]
-bou0.T=[2.731499938964844e+02, 2.731499938964844e+02]
-roo.T=[2.931499938964844e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931413879394531e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931054992675781e+02, 2.931015319824219e+02, 2.930982055664062e+02, 2.930954284667969e+02, 2.930930786132812e+02, 2.930911560058594e+02, 2.930895690917969e+02, 2.930882568359375e+02, 2.930871887207031e+02, 2.930863037109375e+02, 2.930856018066406e+02, 2.930850219726562e+02, 2.930845642089844e+02, 2.930841674804688e+02, 2.930838623046875e+02, 2.930836181640625e+02, 2.931361999511719e+02, 2.931415710449219e+02, 2.931415405273438e+02, 2.931415100097656e+02, 2.931415100097656e+02, 2.931414794921875e+02, 2.931414489746094e+02, 2.931414184570312e+02, 2.931413879394531e+02, 2.931413879394531e+02, 2.93141357421875e+02, 2.93141357421875e+02, 2.931413269042969e+02, 2.931412963867188e+02, 2.931412963867188e+02, 2.931412963867188e+02, 2.931412658691406e+02, 2.931412658691406e+02, 2.931412353515625e+02, 2.931412353515625e+02, 2.931412353515625e+02, 2.931412048339844e+02, 2.931412048339844e+02, 2.931412048339844e+02, 2.931412048339844e+02, 2.931411743164062e+02, 2.931411743164062e+02, 2.931411743164062e+02, 2.931411743164062e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02]
-time=[0e+00, 3.6e+03]
-oriBot.m_flow=[6.083666905760765e-02, -2.837209589779377e-02, -2.837188541889191e-02, -2.837171591818333e-02, -2.837157994508743e-02, -2.837147004902363e-02, -2.837138064205647e-02, -2.837130986154079e-02, -2.837125211954117e-02, -2.837120555341244e-02, -2.837116830050945e-02, -2.837113849818707e-02, -2.837111428380013e-02, -2.837109379470348e-02, -2.837107889354229e-02, -2.837106585502625e-02, -2.83710565418005e-02, 6.600911263376474e-03, 6.600860506296158e-03, 6.600769236683846e-03, 6.600683555006981e-03, 6.600602995604277e-03, 6.60052802413702e-03, 6.600457709282637e-03, 6.600392051041126e-03, 6.600330118089914e-03, 6.600272376090288e-03, 6.60021835938096e-03, 6.600168067961931e-03, 6.600120570510626e-03, 6.600076332688332e-03, 6.600034888833761e-03, 6.599996238946915e-03, 6.599959451705217e-03, 6.599925458431244e-03, 6.599893793463707e-03, 6.599863991141319e-03, 6.599836051464081e-03, 6.599809974431992e-03, 6.599785294383764e-03, 6.599762476980686e-03, 6.59974105656147e-03, 6.599721033126116e-03, 6.599702406674623e-03, 6.599684711545706e-03, 6.59966841340065e-03, 6.599653046578169e-03, 6.599638611078262e-03, 6.59962510690093e-03, 6.599612068384886e-03, 6.570396479219198e-03, 2.990989200770855e-02, 2.963933907449245e-02, 2.941239066421986e-02, 2.922326326370239e-02, 2.906683832406998e-02, 2.893778868019581e-02, 2.883167192339897e-02, 2.874511294066906e-02, 2.867470495402813e-02, 2.861737459897995e-02, 2.857048809528351e-02, 2.853253670036793e-02, 2.850199677050114e-02, 2.847732976078987e-02, 2.84572895616293e-02, 2.844110317528248e-02, -6.389014888554811e-03, -6.403083447366953e-03, -6.415500305593014e-03, -6.427147425711155e-03, -6.438071839511395e-03, -6.448316387832165e-03, -6.457924377173185e-03, -6.466934457421303e-03, -6.475381553173065e-03, -6.483298726379871e-03, -6.490716710686684e-03, -6.49766530841589e-03, -6.504187360405922e-03, -6.510304752737284e-03, -6.516038440167904e-03, -6.521409377455711e-03, -6.526438985019922e-03, -6.531148217618465e-03, -6.535557098686695e-03, -6.539687048643827e-03, -6.543554831296206e-03, -6.547169294208288e-03, -6.550565827637911e-03, -6.55375374481082e-03, -6.556743290275335e-03, -6.559544242918491e-03, -6.562166847288609e-03, -6.564621347934008e-03, -6.566916592419147e-03, -6.569063290953636e-03, -6.571071222424507e-03, -6.572949700057507e-03, -6.574709434062243e-03, -6.576359272003174e-03]
-oriChiTop.m_flow=[-4.225156083703041e-02, 2.162790670990944e-02, 2.16281171888113e-02, 2.162828668951988e-02, 2.162842266261578e-02, 2.162853255867958e-02, 2.162862010300159e-02, 2.162869088351727e-02, 2.162874862551689e-02, 2.162879519164562e-02, 2.162883244454861e-02, 2.162886224687099e-02, 2.162888646125793e-02, 2.162890508770943e-02, 2.162892185151577e-02, 2.162893302738667e-02, 2.162894420325756e-02, 6.600908935070038e-03, 6.600860506296158e-03, 6.600768771022558e-03, 6.600683089345694e-03, 6.600602995604277e-03, 6.600527558475733e-03, 6.600457709282637e-03, 6.600391585379839e-03, 6.600330118089914e-03, 6.600272376090288e-03, 6.60021835938096e-03, 6.600167602300644e-03, 6.600120570510626e-03, 6.600076332688332e-03, 6.600034888833761e-03, 6.599995773285627e-03, 6.599959451705217e-03, 6.599925458431244e-03, 6.59989332780242e-03, 6.599863525480032e-03, 6.599836051464081e-03, 6.599809974431992e-03, 6.599785294383764e-03, 6.599762476980686e-03, 6.59974105656147e-03, 6.599721033126116e-03, 6.599702406674623e-03, 6.599684711545706e-03, 6.599667947739363e-03, 6.599652580916882e-03, 6.599638145416975e-03, 6.599624641239643e-03, 6.599612068384886e-03, 6.617656443268061e-03, -2.009376883506775e-02, -2.036371640861034e-02, -2.059014700353146e-02, -2.077882550656796e-02, -2.093487232923508e-02, -2.106363512575626e-02, -2.116949111223221e-02, -2.125579677522182e-02, -2.132605202496052e-02, -2.138324454426765e-02, -2.143001928925514e-02, -2.146786823868752e-02, -2.149832062423229e-02, -2.152293361723423e-02, -2.154292352497578e-02, -2.155906893312931e-02, -6.389018148183823e-03, -6.403117440640926e-03, -6.415532436221838e-03, -6.427177228033543e-03, -6.43810024484992e-03, -6.448343396186829e-03, -6.4579495228827e-03, -6.466958206146955e-03, -6.475403439253569e-03, -6.4833196811378e-03, -6.490735802799463e-03, -6.497683469206095e-03, -6.504204589873552e-03, -6.510320585221052e-03, -6.516053341329098e-03, -6.521423812955618e-03, -6.526452489197254e-03, -6.531160324811935e-03, -6.535568740218878e-03, -6.539697758853436e-03, -6.543565075844526e-03, -6.547179073095322e-03, -6.55057467520237e-03, -6.553762126713991e-03, -6.55675120651722e-03, -6.559551693499088e-03, -6.562173832207918e-03, -6.564627401530743e-03, -6.566922646015882e-03, -6.569068878889084e-03, -6.571076344698668e-03, -6.57295435667038e-03, -6.574713625013828e-03, -6.57636346295476e-03]
-oriChiBot.m_flow=[-4.225156083703041e-02, 2.162790670990944e-02, 2.16281171888113e-02, 2.162828668951988e-02, 2.162842266261578e-02, 2.162853255867958e-02, 2.162862010300159e-02, 2.162869088351727e-02, 2.162874862551689e-02, 2.162879519164562e-02, 2.162883244454861e-02, 2.162886224687099e-02, 2.162888646125793e-02, 2.162890508770943e-02, 2.162892185151577e-02, 2.162893302738667e-02, 2.162894420325756e-02, 6.600908935070038e-03, 6.600860506296158e-03, 6.600768771022558e-03, 6.600683089345694e-03, 6.600602995604277e-03, 6.600527558475733e-03, 6.600457709282637e-03, 6.600391585379839e-03, 6.600330118089914e-03, 6.600272376090288e-03, 6.60021835938096e-03, 6.600167602300644e-03, 6.600120570510626e-03, 6.600076332688332e-03, 6.600034888833761e-03, 6.599995773285627e-03, 6.599959451705217e-03, 6.599925458431244e-03, 6.59989332780242e-03, 6.599863525480032e-03, 6.599836051464081e-03, 6.599809974431992e-03, 6.599785294383764e-03, 6.599762476980686e-03, 6.59974105656147e-03, 6.599721033126116e-03, 6.599702406674623e-03, 6.599684711545706e-03, 6.599667947739363e-03, 6.599652580916882e-03, 6.599638145416975e-03, 6.599624641239643e-03, 6.599612068384886e-03, 6.610648706555367e-03, -2.009368315339088e-02, -2.036364376544952e-02, -2.059008739888668e-02, -2.077877707779408e-02, -2.093483321368694e-02, -2.106360159814358e-02, -2.116946503520012e-02, -2.125577628612518e-02, -2.132603526115417e-02, -2.138322964310646e-02, -2.143000811338425e-02, -2.146785892546177e-02, -2.14983131736517e-02, -2.152292802929878e-02, -2.154291793704033e-02, -2.155906520783901e-02, -6.389018148183823e-03, -6.403116509318352e-03, -6.415531504899263e-03, -6.427176762372255e-03, -6.438099313527346e-03, -6.448342464864254e-03, -6.457948591560125e-03, -6.466957274824381e-03, -6.475402973592281e-03, -6.483319215476513e-03, -6.490735337138176e-03, -6.497683003544807e-03, -6.504204124212265e-03, -6.510320119559765e-03, -6.51605287566781e-03, -6.521423347294331e-03, -6.526452023535967e-03, -6.531159859150648e-03, -6.53556827455759e-03, -6.539697293192148e-03, -6.543564610183239e-03, -6.547178607434034e-03, -6.55057467520237e-03, -6.553762126713991e-03, -6.55675120651722e-03, -6.559551693499088e-03, -6.562173832207918e-03, -6.564627401530743e-03, -6.566922646015882e-03, -6.569068878889084e-03, -6.57107587903738e-03, -6.57295435667038e-03, -6.574713625013828e-03, -6.576362997293472e-03]
-con.u_m=[2.931499938964844e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931413879394531e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931410827636719e+02, 2.931054992675781e+02, 2.931015319824219e+02, 2.930982055664062e+02, 2.930954284667969e+02, 2.930930786132812e+02, 2.930911560058594e+02, 2.930895690917969e+02, 2.930882568359375e+02, 2.930871887207031e+02, 2.930863037109375e+02, 2.930856018066406e+02, 2.930850219726562e+02, 2.930845642089844e+02, 2.930841674804688e+02, 2.930838623046875e+02, 2.930836181640625e+02, 2.931361999511719e+02, 2.931415710449219e+02, 2.931415405273438e+02, 2.931415100097656e+02, 2.931415100097656e+02, 2.931414794921875e+02, 2.931414489746094e+02, 2.931414184570312e+02, 2.931413879394531e+02, 2.931413879394531e+02, 2.93141357421875e+02, 2.93141357421875e+02, 2.931413269042969e+02, 2.931412963867188e+02, 2.931412963867188e+02, 2.931412963867188e+02, 2.931412658691406e+02, 2.931412658691406e+02, 2.931412353515625e+02, 2.931412353515625e+02, 2.931412353515625e+02, 2.931412048339844e+02, 2.931412048339844e+02, 2.931412048339844e+02, 2.931412048339844e+02, 2.931411743164062e+02, 2.931411743164062e+02, 2.931411743164062e+02, 2.931411743164062e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02, 2.931411437988281e+02]
-con.u_s=[2.931499938964844e+02, 2.931499938964844e+02]
-con.y=[0e+00, -9.764179412741214e-05, 3.762793767236872e-06, -7.613675734319258e-07, 4.026648525723431e-07, -1.286935003008693e-07, -1.805915417207871e-08, 4.227416638968864e-08, 4.5249066715769e-08, 2.004810539801838e-08, -4.146727405895945e-09, 1.847126895881956e-09, 7.014193670329405e-09, 7.285052561201155e-09, 5.64085667065228e-09, 3.481659405224491e-09, 2.206377303082263e-09, 4.307697340846062e-02, 4.462497681379318e-02, 4.462533816695213e-02, 4.462449997663498e-02, 4.462401196360588e-02, 4.462346434593201e-02, 4.46229912340641e-02, 4.462254792451859e-02, 4.462212696671486e-02, 4.462173208594322e-02, 4.462136328220367e-02, 4.462102055549622e-02, 4.462069645524025e-02, 4.462039470672607e-02, 4.462011530995369e-02, 4.46198470890522e-02, 4.46196012198925e-02, 4.46193665266037e-02, 4.461915045976639e-02, 4.461894556879997e-02, 4.461875557899475e-02, 4.461858049035072e-02, 4.461841285228729e-02, 4.461825639009476e-02, 4.461811110377312e-02, 4.461797326803207e-02, 4.461784660816193e-02, 4.461772739887238e-02, 4.461761564016342e-02, 4.461750760674477e-02, 4.461741074919701e-02, 4.461731761693954e-02, 4.461723193526268e-02, 4.459672793745995e-02, 2.225784212350845e-01, 2.422700375318527e-01, 2.589049935340881e-01, 2.728905677795411e-01, 2.845418155193329e-01, 2.942048013210297e-01, 3.021895587444305e-01, 3.087324798107147e-01, 3.140670657157898e-01, 3.184195160865784e-01, 3.219866156578064e-01, 3.248805403709412e-01, 3.272134959697723e-01, 3.290976583957672e-01, 3.306294083595276e-01, 3.318682909011841e-01, 6.895159184932709e-02, 4.213257506489754e-02, 4.223420098423958e-02, 4.237833991646767e-02, 4.251786321401596e-02, 4.264854267239571e-02, 4.277109354734421e-02, 4.28863950073719e-02, 4.299476370215416e-02, 4.309651255607605e-02, 4.319193214178085e-02, 4.328146949410439e-02, 4.336563497781754e-02, 4.34446856379509e-02, 4.351887479424477e-02, 4.358845949172974e-02, 4.36536967754364e-02, 4.371483623981476e-02, 4.37721386551857e-02, 4.382585734128952e-02, 4.387620463967323e-02, 4.392330348491669e-02, 4.39675860106945e-02, 4.400917887687683e-02, 4.404821246862411e-02, 4.408480599522591e-02, 4.411908984184265e-02, 4.41511906683445e-02, 4.4181227684021e-02, 4.420933499932289e-02, 4.423563182353973e-02, 4.426024854183197e-02, 4.428331181406975e-02, 4.430494084954262e-02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_ClosedDoors.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_ClosedDoors.txt
deleted file mode 100644
index 49e8f4ca..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_ClosedDoors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-last-generated=2017-03-10
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "15",
- "linear": "0, 0, 0"
-}
-dooAB.vBA=[3.000000026077032e-03, 1.283652428537607e-02, 2.397985383868217e-02, 3.493466600775719e-02, 4.508498311042786e-02, 5.445227026939392e-02, 6.306394189596176e-02, 7.071121782064438e-02, 7.726854085922241e-02, 8.264617621898651e-02, 8.670396357774734e-02, 8.938071131706238e-02, 9.081884473562241e-02, 9.084463119506836e-02, 8.937866240739822e-02, 8.872994780540466e-02, 8.614905923604965e-02, 8.374402672052383e-02, 8.023499697446823e-02, 7.582546025514603e-02, 7.19577819108963e-02, 6.61994144320488e-02, 6.167994067072868e-02, 5.611890181899071e-02, 5.016535148024559e-02, 4.531124979257584e-02, 3.891074657440186e-02, 3.42452898621559e-02, 2.909125946462153e-02, 2.381199225783348e-02, 2.007311955094337e-02, 1.522943936288357e-02, 1.232962030917406e-02, 9.124261327087879e-03, 6.459479220211506e-03, 4.824853967875242e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 2.991332905367017e-03, 1.28398360684514e-02, 2.407264150679111e-02, 3.484350442886353e-02, 4.503130912780768e-02, 5.443280935287481e-02, 6.307248771190649e-02, 7.070997357368469e-02, 7.726670801639557e-02, 8.263504505157471e-02, 8.673489093780518e-02, 8.948252350091934e-02, 9.085080772638321e-02, 9.081475436687469e-02, 8.936533331871033e-02, 8.86625275015831e-02, 8.609658479690552e-02, 8.363311737775803e-02, 8.015330135822296e-02, 7.570604234933853e-02, 7.185351848602295e-02, 6.610708683729172e-02, 6.156597286462784e-02, 5.601247027516365e-02, 5.004888027906418e-02, 4.518952965736389e-02, 3.879201784729958e-02, 3.412016108632088e-02, 2.910647913813591e-02, 2.369528077542782e-02, 1.996755599975586e-02, 1.511616073548794e-02, 1.223538536578417e-02, 8.999824523925781e-03, 6.420828867703676e-03, 4.7373385168612e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.259406425058842e-03]
-dooAC.vAB=[1.000000047497451e-03, 3.725354559719563e-03, 3.919844981282949e-03, 4.192737396806479e-03, 4.297592677175999e-03, 4.348416812717915e-03, 4.38704015687108e-03, 4.417203366756439e-03, 4.438777919858694e-03, 4.453322850167751e-03, 4.461416974663734e-03, 4.461494740098715e-03, 4.451300483196974e-03, 4.428577609360218e-03, 4.391067661345005e-03, 4.380588419735432e-03, 4.379505291581154e-03, 4.387627821415663e-03, 4.395767580717802e-03, 4.372242838144302e-03, 4.421495366841555e-03, 4.376554861664772e-03, 4.407287575304508e-03, 4.407504107803106e-03, 4.378661047667265e-03, 4.43361746147275e-03, 4.376922734081745e-03, 4.40665427595377e-03, 4.407652653753757e-03, 4.380094818770885e-03, 4.419128876179457e-03, 4.388744942843914e-03, 4.387056455016136e-03, 4.38415165990591e-03, 4.370942246168852e-03, 4.381000529974699e-03, 4.38555795699358e-03, 4.415606148540974e-03, 4.458659794181585e-03, 4.466126207262278e-03, 4.461842589080334e-03, 4.453673027455807e-03, 4.439079668372869e-03, 4.41752327606082e-03, 4.387725610285997e-03, 4.34822915121913e-03, 4.296364262700081e-03, 4.194671753793955e-03, 3.916994668543339e-03, 3.725164337083697e-03, 3.666107542812824e-03, 3.725242568179965e-03, 3.92159353941679e-03, 4.190380219370127e-03, 4.297278355807066e-03, 4.350291099399328e-03, 4.386857617646456e-03, 4.4178725220263e-03, 4.439425654709339e-03, 4.454005043953657e-03, 4.46223421022296e-03, 4.46556881070137e-03, 4.45559062063694e-03, 4.423582926392555e-03, 4.38205199316144e-03, 4.380475264042616e-03, 4.376030527055264e-03, 4.387122113257647e-03, 4.39406419172883e-03, 4.372975323349237e-03, 4.420705605298281e-03, 4.376570228487253e-03, 4.406609106808901e-03, 4.406822845339775e-03, 4.382140934467316e-03, 4.433343186974525e-03, 4.398671444505453e-03, 4.412687383592129e-03, 4.402362275868654e-03, 4.37953881919384e-03, 4.420723300427198e-03, 4.371256567537785e-03, 4.394325893372297e-03, 4.38417587429285e-03, 4.376037046313286e-03, 4.378450568765402e-03, 4.380277823656797e-03, 4.418841097503901e-03, 4.459992051124573e-03, 4.467599093914032e-03, 4.463444463908672e-03, 4.452977329492569e-03, 4.439389798790216e-03, 4.417664371430874e-03, 4.38751420006156e-03, 4.348172340542078e-03, 4.301028326153755e-03, 4.194142762571573e-03, 3.916063345968723e-03, 3.725336631760001e-03, 3.667422104626894e-03]
-dooBC.vAB=[1.000000047497451e-03, 1.338570099323988e-02, 2.414148673415184e-02, 3.455178812146187e-02, 4.448999464511871e-02, 5.375592038035393e-02, 6.229022517800331e-02, 6.987685710191727e-02, 7.639095187187195e-02, 8.173941820859909e-02, 8.578108996152878e-02, 8.844736963510513e-02, 8.990351855754852e-02, 9.002205729484558e-02, 8.859216421842575e-02, 8.770232647657394e-02, 8.524609357118607e-02, 8.253750205039978e-02, 7.916570454835892e-02, 7.450069487094879e-02, 7.070057094097137e-02, 6.509869545698166e-02, 6.028293073177338e-02, 5.485980585217476e-02, 4.866870120167732e-02, 4.387396946549416e-02, 3.764866665005684e-02, 3.269098326563834e-02, 2.767476625740526e-02, 2.216119319200516e-02, 1.848915219306946e-02, 1.381208747625351e-02, 1.060813572257757e-02, 7.558790501207113e-03, 4.611221142113209e-03, 3.095427295193076e-03, 9.917556308209896e-04, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 2.320704516023397e-03, 1.338983979076147e-02, 2.423282712697983e-02, 3.445084765553474e-02, 4.443418234586722e-02, 5.373742431402212e-02, 6.22971579432488e-02, 6.987441331148148e-02, 7.638788968324661e-02, 8.172705769538879e-02, 8.581025898456573e-02, 8.854908496141434e-02, 8.993085473775864e-02, 8.998330682516098e-02, 8.860534429550171e-02, 8.76305028796196e-02, 8.518969267606735e-02, 8.242622017860413e-02, 7.908110320568085e-02, 7.438244670629501e-02, 7.059591263532639e-02, 6.500658392906189e-02, 6.017027795314789e-02, 5.475421622395515e-02, 4.855449125170708e-02, 4.375476390123367e-02, 3.753698244690895e-02, 3.256841003894806e-02, 2.768819034099579e-02, 2.20467671751976e-02, 1.83885395526886e-02, 1.369933690875769e-02, 1.051841024309397e-02, 7.440754678100348e-03, 4.574804101139307e-03, 3.014734946191311e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 2.583551919087768e-03]
-dooAC.vBA=[3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03]
-dooAB.vAB=[1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.028781291097406e-03, 3.152506425976753e-03, 4.649586975574493e-03, 7.612890098243952e-03, 1.063328143209219e-02, 1.387229841202497e-02, 1.851582154631615e-02, 2.218799293041229e-02, 2.769556455314159e-02, 3.269929438829422e-02, 3.768961131572723e-02, 4.383226856589317e-02, 4.868184775114059e-02, 5.483094975352289e-02, 6.025133654475213e-02, 6.507058441638947e-02, 7.064037024974823e-02, 7.445697486400604e-02, 7.907098531723022e-02, 8.24555978178978e-02, 8.527454733848572e-02, 8.765160292387009e-02, 8.86162668466568e-02, 8.998618274927139e-02, 8.995206654071808e-02, 8.85637030005455e-02, 8.581534773111343e-02, 8.173415064811707e-02, 7.640513777732849e-02, 6.989068537950516e-02, 6.230863556265831e-02, 5.377402156591415e-02, 4.44229431450367e-02, 3.445624932646751e-02, 2.416182123124599e-02, 1.339334808290005e-02, 2.328726463019848e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 9.961450705304742e-04, 3.067912766709924e-03, 4.602530505508184e-03, 7.500403095036745e-03, 1.055387780070305e-02, 1.374558545649052e-02, 1.841236092150211e-02, 2.209585718810558e-02, 2.757839486002922e-02, 3.259296342730522e-02, 3.758002445101738e-02, 4.373014718294144e-02, 4.857204481959343e-02, 5.475388839840889e-02, 6.000086292624474e-02, 6.503874063491821e-02, 7.053281366825104e-02, 7.432043552398682e-02, 7.902733236551285e-02, 8.235658705234528e-02, 8.514850586652756e-02, 8.7566077709198e-02, 8.860628306865692e-02, 8.999174833297729e-02, 8.993613719940186e-02, 8.855962753295898e-02, 8.580965548753738e-02, 8.17447155714035e-02, 7.640324532985687e-02, 6.988684087991714e-02, 6.230638176202774e-02, 5.377997830510139e-02, 4.441444203257561e-02, 3.449240326881409e-02, 2.409770898520947e-02, 1.336765475571156e-02, 2.59539857506752e-03]
-time=[0e+00, 7.2e+03]
-dooBC.vBA=[3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077033e-03, 4.887260496616364e-03, 6.499216891825199e-03, 9.181493893265724e-03, 1.235563494265079e-02, 1.529498398303986e-02, 2.010137028992176e-02, 2.384035661816597e-02, 2.911370247602463e-02, 3.425449877977371e-02, 3.895295038819313e-02, 4.526934400200844e-02, 5.017976462841034e-02, 5.609058216214182e-02, 6.164890900254251e-02, 6.617077440023422e-02, 7.189842313528061e-02, 7.577890157699585e-02, 8.014270663261414e-02, 8.366332948207855e-02, 8.618191629648209e-02, 8.868161588907242e-02, 8.936738222837448e-02, 9.081675857305527e-02, 9.086927771568298e-02, 8.94959419965744e-02, 8.673903346061707e-02, 8.26413482427597e-02, 7.728336751461029e-02, 7.072575390338898e-02, 6.308306753635406e-02, 5.447003990411758e-02, 4.501980915665627e-02, 3.484569117426872e-02, 2.399937063455582e-02, 1.28435380756855e-02, 2.990701701492071e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 3.000000026077032e-03, 4.7977389767766e-03, 6.451546214520931e-03, 9.066212922334671e-03, 1.227512303739786e-02, 1.516793202608824e-02, 1.999591290950775e-02, 2.374849282205105e-02, 2.899540774524212e-02, 3.414900600910187e-02, 3.884302824735641e-02, 4.516753554344177e-02, 5.006721243262291e-02, 5.601398274302483e-02, 6.139922887086868e-02, 6.614062935113907e-02, 7.179196178913116e-02, 7.564613968133926e-02, 8.010058104991913e-02, 8.356540650129318e-02, 8.605456352233887e-02, 8.860019594430923e-02, 8.936724811792374e-02, 9.08270850777626e-02, 9.085638076066971e-02, 8.949092030525208e-02, 8.673350512981415e-02, 8.265286684036255e-02, 7.728199660778046e-02, 7.072249799966812e-02, 6.308163702487946e-02, 5.447549745440483e-02, 4.501090571284294e-02, 3.4895870834589e-02, 2.392856404185295e-02, 1.281818095594645e-02, 3.254391020163894e-03]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_NaturalVentilation.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_NaturalVentilation.txt
deleted file mode 100644
index b36e21c6..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_NaturalVentilation.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-last-generated=2015-06-05
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'number of continuous time states': '8', 'linear': ' '}
-volA.T=[291.149993896484375, 291.230010986328125, 291.3079833984375, 291.38409423828125, 291.458404541015625, 291.531005859375, 291.601959228515625, 291.67138671875, 291.73931884765625, 291.8057861328125, 291.870849609375, 291.934600830078125, 291.997039794921875, 292.0582275390625, 292.11822509765625, 292.17706298828125, 292.23480224609375, 292.291473388671875, 292.347137451171875, 292.401824951171875, 292.45562744140625, 292.508575439453125, 292.560760498046875, 292.6121826171875, 292.66290283203125, 292.713043212890625, 292.762603759765625, 292.8116455078125, 292.860260009765625, 292.90850830078125, 292.956451416015625, 293.004150390625, 293.051666259765625, 293.09906005859375, 293.146392822265625, 293.193695068359375, 293.240936279296875, 293.288055419921875, 293.33502197265625, 293.3817138671875, 293.42816162109375, 293.4742431640625, 293.519927978515625, 293.565185546875, 293.609954833984375, 293.654205322265625, 293.697906494140625, 293.74102783203125, 293.7835693359375, 293.825439453125, 293.86669921875, 293.8603515625, 293.8541259765625, 293.84796142578125, 293.8419189453125, 293.835968017578125, 293.83013916015625, 293.824371337890625, 293.818695068359375, 293.813079833984375, 293.807586669921875, 293.802154541015625, 293.79681396484375, 293.79156494140625, 293.786376953125, 293.781280517578125, 293.7762451171875, 293.77130126953125, 293.76641845703125, 293.7615966796875, 293.756866455078125, 293.752166748046875, 293.74755859375, 293.7430419921875, 293.738555908203125, 293.734130859375, 293.729766845703125, 293.725494384765625, 293.72125244140625, 293.717071533203125, 293.71295166015625, 293.7088623046875, 293.704864501953125, 293.700897216796875, 293.697021484375, 293.693145751953125, 293.689361572265625, 293.68560791015625, 293.681915283203125, 293.678253173828125, 293.674652099609375, 293.67108154296875, 293.667572021484375, 293.664093017578125, 293.660675048828125, 293.65728759765625, 293.6539306640625, 293.650634765625, 293.64739990234375, 293.6441650390625, 293.6409912109375]
-volOut.T=[293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375]
-time=[0., 7200.]
-oriOutTop.v=[-0.4126987159252166748, -0.28590992093086242676, -0.28000730276107788086, -0.2741266787052154541, -0.26826259493827819824, -0.26240906119346618652, -0.25654387474060058594, -0.25062102079391479492, -0.24458864331245422363, -0.2383947521448135376, -0.23199179768562316895, -0.22534008324146270752, -0.21840356290340423584, -0.21116402745246887207, -0.20360229909420013428, -0.19570964574813842773, -0.18748836219310760498, -0.17894503474235534668, -0.17009471356868743896, -0.16092622280120849609, -0.15148854255676269531, -0.1418056786060333252, -0.13190023601055145264, -0.12179553508758544922, -0.1114419102668762207, -0.1009145006537437439, -0.09033244848251342773, -0.07968588173389432039, -0.06895993649959561433, -0.0581356436014175415, -0.04562167823314666748, -0.03457035869359970093, -0.02369826845824718475, -0.01217736117541790009, -0.00086357630789279938, 0.01044021826237440109, 0.02169842831790447235, 0.03286679089069366455, 0.04390209540724754333, 0.05476356670260429382, 0.0654139593243598938, 0.07581910490989685059, 0.0859503522515296936, 0.0957773551344871521, 0.10527995973825454712, 0.11444223672151565552, 0.12325169146060943604, 0.13169914484024047852, 0.1397787928581237793, 0.14748926460742950439, 0.15483300387859344482, 0.15372025966644287109, 0.15261945128440856934, 0.15153051912784576416, 0.15045337378978729248, 0.14938794076442718506, 0.14833411574363708496, 0.14729177951812744141, 0.14626082777976989746, 0.14524111151695251465, 0.14423249661922454834, 0.14323495328426361084, 0.14224831759929656982, 0.14127245545387268066, 0.14030724763870239258, 0.13935261964797973633, 0.13840848207473754883, 0.13747470080852508545, 0.13655118644237518311, 0.13563778996467590332, 0.13473440706729888916, 0.13384103775024414062, 0.13295775651931762695, 0.13208390772342681885, 0.13121943175792694092, 0.13036426901817321777, 0.12951833009719848633, 0.12868155539035797119, 0.12785384058952331543, 0.12703512609004974365, 0.12622529268264770508, 0.12542426586151123047, 0.12463192641735076904, 0.12384818494319915771, 0.12307292968034744263, 0.12230604887008666992, 0.12154743075370788574, 0.12079694867134094238, 0.12005448341369628906, 0.11931990832090377808, 0.11859310418367385864, 0.11787395179271697998, 0.11716237664222717285, 0.11645828932523727417, 0.11576160043478012085, 0.11507222801446914673, 0.11439006775617599487, 0.11371504515409469604, 0.11304705590009689331, 0.11238600313663482666, 0.11173178255558013916]
-oriOutBot.v=[0., 0.28591075539588928223, 0.28000810742378234863, 0.27412745356559753418, 0.26826336979866027832, 0.2624098360538482666, 0.25654461979866027832, 0.25062170624732971191, 0.24458958208560943604, 0.23839649558067321777, 0.23199421167373657227, 0.22534079849720001221, 0.21840754151344299316, 0.21116499602794647217, 0.20360156893730163574, 0.19571070373058319092, 0.18748870491981506348, 0.17893962562084197998, 0.17006859183311462402, 0.16091446578502655029, 0.15146310627460479736, 0.14172826707363128662, 0.13172823190689086914, 0.12148252129554748535, 0.11108378320932388306, 0.10049956291913986206, 0.08965420722961425781, 0.07859934866428371081, 0.0673905462026595653, 0.05608626455068588257, 0.04629112407565116882, 0.03490351885557174683, 0.02324308641254901886, 0.0121773621067404747, 0.00086461519822478294, -0.01043987926095724106, -0.02169803902506828308, -0.03286611288785934448, -0.04390154778957366943, -0.05476318672299385071, -0.06541347503662109375, -0.07581862062215805054, -0.08594989031553268433, -0.09577687829732894897, -0.10527947545051574707, -0.11444178968667984009, -0.12325131893157958984, -0.13169887661933898926, -0.1397784501314163208, -0.14748878777027130127, -0.15483258664608001709, -0.15372018516063690186, -0.15261958539485931396, -0.15153074264526367188, -0.15045362710952758789, -0.14938814938068389893, -0.14833423495292663574, -0.14729182422161102295, -0.14626079797744750977, -0.14524106681346893311, -0.14423251152038574219, -0.14323501288890838623, -0.14224837720394134521, -0.14127250015735626221, -0.14030730724334716797, -0.13935267925262451172, -0.13840854167938232422, -0.13747477531433105469, -0.13655127584934234619, -0.1356379091739654541, -0.13473455607891082764, -0.1338411867618560791, -0.13295786082744598389, -0.13208396732807159424, -0.13121947646141052246, -0.13036428391933441162, -0.12951834499835968018, -0.12868155539035797119, -0.12785385549068450928, -0.12703512609004974365, -0.12622530758380889893, -0.12542428076267242432, -0.12463195621967315674, -0.12384822219610214233, -0.12307297438383102417, -0.12230610102415084839, -0.12154747545719146729, -0.12079700082540512085, -0.12005452811717987061, -0.11931995302438735962, -0.11859313398599624634, -0.11787398159503936768, -0.11716241389513015747, -0.11645832657814025879, -0.11576164513826370239, -0.11507226526737213135, -0.11439010500907897949, -0.11371507495641708374, -0.11304708570241928101, -0.11238602548837661743, -0.11173181235790252686]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_OneEffectiveAirLeakageArea.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_OneEffectiveAirLeakageArea.txt
deleted file mode 100644
index 6b4a5f99..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_OneEffectiveAirLeakageArea.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-last-generated=2017-06-05
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "7",
- "linear": " "
-}
-cra.v=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.332246094942093e-02, 6.665902584791195e-02, 9.988399595022213e-02, 1.339095085859299e-01, 1.662406474351883e-01, 2.0001220703125e-01, 2.333514094352722e-01, 2.666923999786377e-01, 3.000315129756927e-01, 3.333694934844971e-01, 3.667111396789551e-01, 4.000533819198608e-01, 4.333924949169159e-01, 4.667311906814575e-01, 5.00071108341217e-01, 5.334135890007019e-01, 5.667566657066345e-01, 6.000956296920776e-01, 6.334363222122192e-01, 6.667771339416504e-01, 7.00117826461792e-01, 7.334594130516052e-01, 7.668007016181946e-01, 8.001410961151123e-01, 8.33483099937439e-01, 8.668243885040283e-01, 9.00165855884552e-01, 9.335067868232727e-01, 9.668485522270205e-01, 1.000190138816834e+00, 1.033530831336975e+00, 1.066872119903564e+00, 1.100212931632996e+00, 1.13355553150177e+00, 1.166896820068359e+00, 1.200236678123474e+00, 1.233577847480774e+00, 1.266922235488892e+00, 1.300264716148376e+00, 1.333606600761414e+00, 1.366949319839478e+00, 1.400293827056885e+00, 1.433628916740417e+00, 1.466971278190613e+00, 1.500315189361572e+00, 1.533655762672424e+00, 1.566997528076172e+00, 1.60033917427063e+00, 1.633681297302246e+00, 1.667023062705994e+00, 1.667229652404785e+00, 1.667148590087891e+00, 1.667174696922302e+00, 1.667174816131592e+00, 1.667174577713013e+00, 1.667174696922302e+00, 1.667174696922302e+00, 1.667174696922302e+00, 1.667174696922302e+00, 1.667174696922302e+00, 1.667174696922302e+00, 1.667174696922302e+00, 1.667174696922302e+00, 1.667174696922302e+00, 1.667174696922302e+00, 1.667174696922302e+00, 1.667174696922302e+00, 1.667174696922302e+00, 1.667174696922302e+00, 1.667174696922302e+00, 1.667174696922302e+00, 1.667174696922302e+00, 1.667174696922302e+00, 1.667174696922302e+00, 1.667174696922302e+00]
-time=[0e+00, 7.2e+03]
-cra.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.993692219723016e-05, 1.999161322601143e-04, 2.995606919284913e-04, 4.016061138827354e-04, 4.985699779354036e-04, 5.998537526465952e-04, 6.998408935032785e-04, 7.998334476724267e-04, 8.998202392831445e-04, 9.998036548495293e-04, 1.099798129871488e-03, 1.199794351123273e-03, 1.299781259149313e-03, 1.399766886606812e-03, 1.499756122939289e-03, 1.599753159098327e-03, 1.699751941487193e-03, 1.799738267436624e-03, 1.899729832075536e-03, 1.999721862375736e-03, 2.099713543429971e-03, 2.199707785621285e-03, 2.299701096490026e-03, 2.399691846221685e-03, 2.499687252566218e-03, 2.599680796265602e-03, 2.699674805626273e-03, 2.799666952341795e-03, 2.899661660194397e-03, 2.999655902385712e-03, 3.09964781627059e-03, 3.19964112713933e-03, 3.299632808193564e-03, 3.399630077183247e-03, 3.49962362088263e-03, 3.599612740799785e-03, 3.699605818837881e-03, 3.799608675763011e-03, 3.899605246260762e-03, 3.999600652605295e-03, 4.099598154425621e-03, 4.199601244181395e-03, 4.299575928598642e-03, 4.399572499096394e-03, 4.499574191868305e-03, 4.599565174430609e-03, 4.699559882283211e-03, 4.799554590135813e-03, 4.899550694972277e-03, 4.999545402824879e-03, 5.000164732336998e-03, 4.999921657145023e-03, 4.999999888241291e-03, 5.000000353902578e-03, 4.999999422580004e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_OneOpenDoor.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_OneOpenDoor.txt
deleted file mode 100644
index b17bd469..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_OneOpenDoor.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-last-generated=2017-03-10
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "8",
- "linear": "0, 0"
-}
-dooOpeClo.vAB=[1.000000047497451e-03, 2.022213768213987e-03, 3.083108458667994e-03, 4.872014280408621e-03, 7.129498291760683e-03, 9.461331181228161e-03, 1.160428766161203e-02, 1.349009852856398e-02, 1.516417320817709e-02, 1.663253270089626e-02, 1.789583452045918e-02, 1.895515620708466e-02, 1.98192372918129e-02, 2.049444057047367e-02, 2.189241722226144e-02, 3.173888102173805e-02, 3.707840666174889e-02, 3.513317927718163e-02, 3.35753969848156e-02, 3.218930214643478e-02, 3.082977421581745e-02, 2.939432486891747e-02, 2.780364081263542e-02, 2.598125487565994e-02, 2.383957430720329e-02, 2.127626724541187e-02, 1.81761123239994e-02, 1.440967712551354e-02, 9.829510003328308e-03, 4.370834678411484e-03, 6.443358026444912e-03, 1.331105548888445e-02, 1.909642480313778e-02, 2.336676232516766e-02, 2.638707309961319e-02, 2.853270620107651e-02, 3.006411902606487e-02, 3.113612905144691e-02, 3.184701502323151e-02, 3.226024284958839e-02, 3.241692110896111e-02, 3.234319388866425e-02, 3.205401450395584e-02, 3.155634924769402e-02, 3.085025958716869e-02, 2.992849797010422e-02, 2.877664938569069e-02, 2.736927382647991e-02, 2.56643258035183e-02, 2.359730936586857e-02, 2.108077518641949e-02, 1.800605654716492e-02, 1.425326336175203e-02, 9.670292027294636e-03, 4.197601228952373e-03, 6.577676627785012e-03, 1.342950109392409e-02, 1.91804263740778e-02, 2.341631427407265e-02, 2.641155570745468e-02, 2.85398755222559e-02, 3.005852364003658e-02, 3.112075664103031e-02, 3.182340413331985e-02, 3.223005682229996e-02, 3.238163888454437e-02, 3.230391070246696e-02, 3.201204165816307e-02, 3.151282295584679e-02, 3.080599568784237e-02, 2.988473139703274e-02, 2.873457223176956e-02, 2.733065560460091e-02, 2.563039772212505e-02, 2.356830611824989e-02, 2.105887793004513e-02, 1.799525134265423e-02, 1.425303239375353e-02, 9.683500044047832e-03, 4.240143578499556e-03, 6.562783382833004e-03, 1.340823993086815e-02, 1.916320249438286e-02, 2.34062671661377e-02, 2.641093544661999e-02, 2.85476315766573e-02, 3.007317520678043e-02, 3.114193864166737e-02, 3.185046836733818e-02, 3.226255625486374e-02, 3.241841867566109e-02, 3.23442630469799e-02, 3.20545993745327e-02, 3.155688568949699e-02, 3.085065074265003e-02, 2.992860600352287e-02, 2.877656184136868e-02, 2.736958488821983e-02, 2.566489204764366e-02, 2.359413541853428e-02, 2.107817679643631e-02]
-dooOpe.vBA=[3.000000026077032e-03, 3.08973272331059e-03, 5.193840712308884e-03, 8.793649263679981e-03, 1.337678264826536e-02, 1.820818148553371e-02, 2.268081344664097e-02, 2.649455517530442e-02, 2.967061847448349e-02, 3.232098743319511e-02, 3.452019020915031e-02, 3.631820902228355e-02, 3.775166720151901e-02, 3.885222598910332e-02, 3.960882872343063e-02, 3.919174149632454e-02, 3.71120423078537e-02, 3.516459092497826e-02, 3.360402956604958e-02, 3.221471980214119e-02, 3.08515802025795e-02, 2.941221930086613e-02, 2.781743742525578e-02, 2.599074132740498e-02, 2.384418994188309e-02, 2.127634547650814e-02, 1.817136630415916e-02, 1.440039370208977e-02, 9.81641467660664e-03, 4.352807067334652e-03, 6.421676836907864e-03, 1.328564994037151e-02, 1.906738802790642e-02, 2.333535626530647e-02, 2.635369822382927e-02, 2.849738113582134e-02, 3.00274770706892e-02, 3.109919838607311e-02, 3.180992230772972e-02, 3.222368285059929e-02, 3.238162025809288e-02, 3.230945765972137e-02, 3.202258795499802e-02, 3.152782842516899e-02, 3.082481771707535e-02, 2.990664169192314e-02, 2.875842340290546e-02, 2.735561691224575e-02, 2.565530128777027e-02, 2.359221316874027e-02, 2.107921056449413e-02, 1.801100932061672e-02, 1.425838377326727e-02, 9.683402255177498e-03, 4.215912893414463e-03, 6.599848624318882e-03, 1.34612545371056e-02, 1.92085187882185e-02, 2.344735339283943e-02, 2.644545584917068e-02, 2.857519313693047e-02, 3.009478934109211e-02, 3.115742467343807e-02, 3.186043724417686e-02, 3.226668760180473e-02, 3.241707012057304e-02, 3.23374941945076e-02, 3.204310312867165e-02, 3.154101595282555e-02, 3.083132579922676e-02, 2.990674786269665e-02, 2.87526436150074e-02, 2.734403870999813e-02, 2.563867531716824e-02, 2.357301861047745e-02, 2.105898223817348e-02, 1.799067482352257e-02, 1.424476690590382e-02, 9.681198745965958e-03, 4.222426563501358e-03, 6.543220486491919e-03, 1.338295824825764e-02, 1.912911795079708e-02, 2.337453328073025e-02, 2.637767046689987e-02, 2.85120215266943e-02, 3.003693744540215e-02, 3.110501915216446e-02, 3.18138413131237e-02, 3.222604468464851e-02, 3.238309919834137e-02, 3.231030330061913e-02, 3.202327713370323e-02, 3.152817487716675e-02, 3.082500211894512e-02, 2.990697883069515e-02, 2.875883318483829e-02, 2.735553123056889e-02, 2.565495856106281e-02, 2.359568513929844e-02, 2.108205482363701e-02]
-dooOpe.vAB=[1.000000047497451e-03, 3.080951049923897e-03, 5.175866186618805e-03, 8.766790851950645e-03, 1.334153302013874e-02, 1.816495880484581e-02, 2.263041771948338e-02, 2.643772400915623e-02, 2.960829436779022e-02, 3.22541669011116e-02, 3.444993868470192e-02, 3.624564781785011e-02, 3.767793625593185e-02, 3.877852112054825e-02, 3.959319368004799e-02, 3.930018842220306e-02, 3.707840666174889e-02, 3.513317927718163e-02, 3.35753969848156e-02, 3.218930214643478e-02, 3.082977421581745e-02, 2.939432486891747e-02, 2.780364081263542e-02, 2.598125487565994e-02, 2.383957430720329e-02, 2.127626724541187e-02, 1.81761123239994e-02, 1.440967712551354e-02, 9.829510003328308e-03, 4.370834678411484e-03, 6.443358026444912e-03, 1.331105548888445e-02, 1.909642480313778e-02, 2.336676232516766e-02, 2.638707309961319e-02, 2.853270620107651e-02, 3.006411902606487e-02, 3.113612905144691e-02, 3.184701502323151e-02, 3.226024284958839e-02, 3.241692110896111e-02, 3.234319388866425e-02, 3.205401450395584e-02, 3.155634924769402e-02, 3.085025958716869e-02, 2.992849797010422e-02, 2.877664938569069e-02, 2.736927382647991e-02, 2.56643258035183e-02, 2.359730936586857e-02, 2.108077518641949e-02, 1.800605654716492e-02, 1.425326336175203e-02, 9.670292027294636e-03, 4.197601228952373e-03, 6.577676627785012e-03, 1.342950109392409e-02, 1.91804263740778e-02, 2.341631427407265e-02, 2.641155570745468e-02, 2.85398755222559e-02, 3.005852364003658e-02, 3.112075664103031e-02, 3.182340413331985e-02, 3.223005682229996e-02, 3.238163888454437e-02, 3.230391070246696e-02, 3.201204165816307e-02, 3.151282295584679e-02, 3.080599568784237e-02, 2.988473139703274e-02, 2.873457223176956e-02, 2.733065560460091e-02, 2.563039772212505e-02, 2.356830611824989e-02, 2.105887793004513e-02, 1.799525134265423e-02, 1.425303239375353e-02, 9.683500044047832e-03, 4.240143578499556e-03, 6.562783382833004e-03, 1.340823993086815e-02, 1.916320249438286e-02, 2.34062671661377e-02, 2.641093544661999e-02, 2.85476315766573e-02, 3.007317520678043e-02, 3.114193864166737e-02, 3.185046836733818e-02, 3.226255625486374e-02, 3.241841867566109e-02, 3.23442630469799e-02, 3.20545993745327e-02, 3.155688568949699e-02, 3.085065074265003e-02, 2.992860600352287e-02, 2.877656184136868e-02, 2.736958488821983e-02, 2.566489204764366e-02, 2.359413541853428e-02, 2.107817679643631e-02]
-dooOpeClo.vBA=[3.000000026077032e-03, 3.024359233677387e-03, 4.091080278158188e-03, 5.88917126879096e-03, 8.160650730133057e-03, 1.050766091793776e-02, 1.265497319400311e-02, 1.452304143458605e-02, 1.617265678942204e-02, 1.761968433856964e-02, 1.886875182390213e-02, 1.991489715874195e-02, 2.076640352606773e-02, 2.143167704343796e-02, 2.274730242788793e-02, 3.200757876038551e-02, 3.71120423078537e-02, 3.516459092497826e-02, 3.360402956604958e-02, 3.221471980214119e-02, 3.08515802025795e-02, 2.941221930086613e-02, 2.781743742525578e-02, 2.599074132740498e-02, 2.384418994188309e-02, 2.127634547650814e-02, 1.817136630415916e-02, 1.440039370208977e-02, 9.81641467660664e-03, 4.352807067334652e-03, 6.421676836907864e-03, 1.328564994037151e-02, 1.906738802790642e-02, 2.333535626530647e-02, 2.635369822382927e-02, 2.849738113582134e-02, 3.00274770706892e-02, 3.109919838607311e-02, 3.180992230772972e-02, 3.222368285059929e-02, 3.238162025809288e-02, 3.230945765972137e-02, 3.202258795499802e-02, 3.152782842516899e-02, 3.082481771707535e-02, 2.990664169192314e-02, 2.875842340290546e-02, 2.735561691224575e-02, 2.565530128777027e-02, 2.359221316874027e-02, 2.107921056449413e-02, 1.801100932061672e-02, 1.425838377326727e-02, 9.683402255177498e-03, 4.215912893414463e-03, 6.599848624318882e-03, 1.34612545371056e-02, 1.92085187882185e-02, 2.344735339283943e-02, 2.644545584917068e-02, 2.857519313693047e-02, 3.009478934109211e-02, 3.115742467343807e-02, 3.186043724417686e-02, 3.226668760180473e-02, 3.241707012057304e-02, 3.23374941945076e-02, 3.204310312867165e-02, 3.154101595282555e-02, 3.083132579922676e-02, 2.990674786269665e-02, 2.87526436150074e-02, 2.734403870999813e-02, 2.563867531716824e-02, 2.357301861047745e-02, 2.105898223817348e-02, 1.799067482352257e-02, 1.424476690590382e-02, 9.681198745965958e-03, 4.222426563501358e-03, 6.543220486491919e-03, 1.338295824825764e-02, 1.912911795079708e-02, 2.337453328073025e-02, 2.637767046689987e-02, 2.85120215266943e-02, 3.003693744540215e-02, 3.110501915216446e-02, 3.18138413131237e-02, 3.222604468464851e-02, 3.238309919834137e-02, 3.231030330061913e-02, 3.202327713370323e-02, 3.152817487716675e-02, 3.082500211894512e-02, 2.990697883069515e-02, 2.875883318483829e-02, 2.735553123056889e-02, 2.565495856106281e-02, 2.359568513929844e-02, 2.108205482363701e-02]
-time=[0e+00, 7.2e+03]
-dooOpeClo.mBA_flow=[3.814370984400739e-06, 3.845303581329063e-06, 5.201423846301623e-06, 7.487166840292048e-06, 1.037434412864968e-05, 1.335702745564049e-05, 1.608534694241825e-05, 1.845829501689878e-05, 2.055327786365524e-05, 2.239059722342063e-05, 2.397626485617366e-05, 2.530410165491048e-05, 2.638473415572662e-05, 2.722892349993344e-05, 3.475454403087551e-03, 4.853753745555878e-02, 8.440012484788895e-02, 7.997645437717438e-02, 7.643096148967743e-02, 7.327409088611603e-02, 7.017628848552704e-02, 6.690486520528793e-02, 6.327973306179047e-02, 5.912687256932259e-02, 5.424614995718002e-02, 4.840664938092232e-02, 4.134461283683777e-02, 3.276657685637471e-02, 2.233765646815296e-02, 9.905717335641384e-03, 1.461511757224798e-02, 3.023969009518623e-02, 4.340348765254021e-02, 5.312291905283928e-02, 5.999807640910149e-02, 6.488185375928879e-02, 6.836826354265213e-02, 7.081051170825958e-02, 7.243023812770844e-02, 7.337323576211929e-02, 7.373320311307907e-02, 7.356873154640198e-02, 7.291492074728012e-02, 7.178732752799988e-02, 7.018521428108215e-02, 6.809289753437042e-02, 6.547660380601883e-02, 6.228054687380791e-02, 5.840712785720825e-02, 5.370792001485825e-02, 4.798471927642822e-02, 4.099810495972633e-02, 3.245419636368752e-02, 2.203944325447083e-02, 9.594722650945109e-03, 1.501887477934371e-02, 3.063009306788454e-02, 4.370366036891937e-02, 5.334378033876419e-02, 6.016070023179054e-02, 6.500227749347687e-02, 6.845629215240479e-02, 7.087138295173645e-02, 7.246901094913483e-02, 7.339219748973846e-02, 7.373391836881638e-02, 7.355309277772903e-02, 7.288411259651184e-02, 7.174311578273773e-02, 7.013025879859924e-02, 6.802888959646225e-02, 6.540562957525253e-02, 6.2203548848629e-02, 5.832641199231148e-02, 5.362952500581741e-02, 4.791231080889702e-02, 4.093361273407936e-02, 3.241254016757011e-02, 2.203000895678997e-02, 9.609025903046131e-03, 1.489176321774721e-02, 3.046121634542942e-02, 4.354405403137207e-02, 5.321215093135834e-02, 6.005268543958664e-02, 6.491521000862122e-02, 6.838981807231903e-02, 7.082377374172211e-02, 7.243916392326355e-02, 7.337862253189087e-02, 7.373657822608948e-02, 7.357066869735718e-02, 7.291649281978607e-02, 7.178811728954315e-02, 7.018563151359558e-02, 6.80936723947525e-02, 6.547754257917404e-02, 6.228035315871239e-02, 5.840634554624557e-02, 5.371582135558128e-02, 4.799119755625725e-02]
-dooOpeClo.mAB_flow=[1.271456994800246e-06, 2.571184040789376e-06, 3.920196832041256e-06, 6.195103651407408e-06, 9.06622335605789e-06, 1.20323866212857e-05, 1.475885164836654e-05, 1.71586998476414e-05, 1.92895568034146e-05, 2.11589449463645e-05, 2.276757368235849e-05, 2.411668538115919e-05, 2.521730129956268e-05, 2.607743226690218e-05, 3.350077895447665e-03, 4.820417985320091e-02, 8.444050699472427e-02, 8.000533282756805e-02, 7.645419239997864e-02, 7.329487055540085e-02, 7.019650191068649e-02, 6.692551821470261e-02, 6.330125778913498e-02, 5.914963409304619e-02, 5.427131056785583e-02, 4.843347519636154e-02, 4.137403517961502e-02, 3.279863297939298e-02, 2.237202972173687e-02, 9.947320446372032e-03, 1.46627901121974e-02, 3.028839081525803e-02, 4.344870150089264e-02, 5.316051840782166e-02, 6.002796813845634e-02, 6.490569561719894e-02, 6.838658452033997e-02, 7.082298398017883e-02, 7.243851572275162e-02, 7.337754219770432e-02, 7.373357564210892e-02, 7.356604188680649e-02, 7.29089081287384e-02, 7.177796959877014e-02, 7.017328590154648e-02, 6.807832419872284e-02, 6.546019017696381e-02, 6.226091831922531e-02, 5.83847314119339e-02, 5.368475988507271e-02, 4.796187207102776e-02, 4.096860066056252e-02, 3.243186697363853e-02, 2.200519293546677e-02, 9.552532806992453e-03, 1.497019082307826e-02, 3.056717664003381e-02, 4.366088286042213e-02, 5.330730974674225e-02, 6.012987345457077e-02, 6.497867405414581e-02, 6.843900680541992e-02, 7.08596333861351e-02, 7.246096432209015e-02, 7.338777184486389e-02, 7.373324781656265e-02, 7.3556087911129e-02, 7.289087772369385e-02, 7.175312936306e-02, 7.014232128858566e-02, 6.804297119379044e-02, 6.542225927114487e-02, 6.222368031740189e-02, 5.835039913654327e-02, 5.365346744656563e-02, 4.793841764330864e-02, 4.096222296357155e-02, 3.244201466441154e-02, 2.203966863453388e-02, 9.649871848523617e-03, 1.493453606963158e-02, 3.050948493182659e-02, 4.360059276223183e-02, 5.325035005807877e-02, 6.008221581578255e-02, 6.493962556123734e-02, 6.840717047452927e-02, 7.083618640899658e-02, 7.244636118412018e-02, 7.338280975818634e-02, 7.373698055744171e-02, 7.356847077608109e-02, 7.291023433208466e-02, 7.177918404340744e-02, 7.017417997121811e-02, 6.807857006788254e-02, 6.545998901128769e-02, 6.226162612438202e-02, 5.838602036237717e-02, 5.367754399776459e-02, 4.79559563100338e-02]
-dooOpe.mBA_flow=[6.827321834862232e-03, 7.03146168962121e-03, 1.181953307241201e-02, 2.001059241592884e-02, 3.043792024254799e-02, 4.142836853861809e-02, 5.160066485404968e-02, 6.027234718203545e-02, 6.749223172664642e-02, 7.35156238079071e-02, 7.85125344991684e-02, 8.259708434343338e-02, 8.585291355848312e-02, 8.83522629737854e-02, 9.00702178478241e-02, 8.912292867898941e-02, 8.440012484788895e-02, 7.997645437717438e-02, 7.643096148967743e-02, 7.327409088611603e-02, 7.017628848552704e-02, 6.690486520528793e-02, 6.327973306179047e-02, 5.912687256932259e-02, 5.424614995718002e-02, 4.840664938092232e-02, 4.134461283683777e-02, 3.276657685637471e-02, 2.233765646815296e-02, 9.905717335641384e-03, 1.461511757224798e-02, 3.023969009518623e-02, 4.340348765254021e-02, 5.312291905283928e-02, 5.999807640910149e-02, 6.488185375928879e-02, 6.836826354265213e-02, 7.081051170825958e-02, 7.243023812770844e-02, 7.337323576211929e-02, 7.373320311307907e-02, 7.356873154640198e-02, 7.291492074728012e-02, 7.178732752799988e-02, 7.018521428108215e-02, 6.809289753437042e-02, 6.547660380601883e-02, 6.228054687380791e-02, 5.840712785720825e-02, 5.370792001485825e-02, 4.798471927642822e-02, 4.099810495972633e-02, 3.245419636368752e-02, 2.203944325447083e-02, 9.594722650945109e-03, 1.501887477934371e-02, 3.063009306788454e-02, 4.370366036891937e-02, 5.334378033876419e-02, 6.016070023179054e-02, 6.500227749347687e-02, 6.845629215240479e-02, 7.087138295173645e-02, 7.246901094913483e-02, 7.339219748973846e-02, 7.373391836881638e-02, 7.355309277772903e-02, 7.288411259651184e-02, 7.174311578273773e-02, 7.013025879859924e-02, 6.802888959646225e-02, 6.540562957525253e-02, 6.2203548848629e-02, 5.832641199231148e-02, 5.362952500581741e-02, 4.791231080889702e-02, 4.093361273407936e-02, 3.241254016757011e-02, 2.203000895678997e-02, 9.609025903046131e-03, 1.489176321774721e-02, 3.046121634542942e-02, 4.354405403137207e-02, 5.321215093135834e-02, 6.005268543958664e-02, 6.491521000862122e-02, 6.838981807231903e-02, 7.082377374172211e-02, 7.243916392326355e-02, 7.337862253189087e-02, 7.373657822608948e-02, 7.357066869735718e-02, 7.291649281978607e-02, 7.178811728954315e-02, 7.018563151359558e-02, 6.80936723947525e-02, 6.547754257917404e-02, 6.228035315871239e-02, 5.840634554624557e-02, 5.371582135558128e-02, 4.799119755625725e-02]
-dooOpe.mAB_flow=[2.275774022564292e-03, 7.011618930846453e-03, 1.177957374602556e-02, 1.995299570262432e-02, 3.036691434681416e-02, 4.13486547768116e-02, 5.151741951704025e-02, 6.018950417637826e-02, 6.741310656070709e-02, 7.344274967908859e-02, 7.844778895378113e-02, 8.254173398017883e-02, 8.580769598484039e-02, 8.83176326751709e-02, 9.017564356327057e-02, 8.950714021921158e-02, 8.444050699472427e-02, 8.000533282756805e-02, 7.645419239997864e-02, 7.329487055540085e-02, 7.019650191068649e-02, 6.692551821470261e-02, 6.330125778913498e-02, 5.914963409304619e-02, 5.427131056785583e-02, 4.843347519636154e-02, 4.137403517961502e-02, 3.279863297939298e-02, 2.237202972173687e-02, 9.947320446372032e-03, 1.46627901121974e-02, 3.028839081525803e-02, 4.344870150089264e-02, 5.316051840782166e-02, 6.002796813845634e-02, 6.490569561719894e-02, 6.838658452033997e-02, 7.082298398017883e-02, 7.243851572275162e-02, 7.337754219770432e-02, 7.373357564210892e-02, 7.356604188680649e-02, 7.29089081287384e-02, 7.177796959877014e-02, 7.017328590154648e-02, 6.807832419872284e-02, 6.546019017696381e-02, 6.226091831922531e-02, 5.83847314119339e-02, 5.368475988507271e-02, 4.796187207102776e-02, 4.096860066056252e-02, 3.243186697363853e-02, 2.200519293546677e-02, 9.552532806992453e-03, 1.497019082307826e-02, 3.056717664003381e-02, 4.366088286042213e-02, 5.330730974674225e-02, 6.012987345457077e-02, 6.497867405414581e-02, 6.843900680541992e-02, 7.08596333861351e-02, 7.246096432209015e-02, 7.338777184486389e-02, 7.373324781656265e-02, 7.3556087911129e-02, 7.289087772369385e-02, 7.175312936306e-02, 7.014232128858566e-02, 6.804297119379044e-02, 6.542225927114487e-02, 6.222368031740189e-02, 5.835039913654327e-02, 5.365346744656563e-02, 4.793841764330864e-02, 4.096222296357155e-02, 3.244201466441154e-02, 2.203966863453388e-02, 9.649871848523617e-03, 1.493453606963158e-02, 3.050948493182659e-02, 4.360059276223183e-02, 5.325035005807877e-02, 6.008221581578255e-02, 6.493962556123734e-02, 6.840717047452927e-02, 7.083618640899658e-02, 7.244636118412018e-02, 7.338280975818634e-02, 7.373698055744171e-02, 7.356847077608109e-02, 7.291023433208466e-02, 7.177918404340744e-02, 7.017417997121811e-02, 6.807857006788254e-02, 6.545998901128769e-02, 6.226162612438202e-02, 5.838602036237717e-02, 5.367754399776459e-02, 4.79559563100338e-02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_OneRoom.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_OneRoom.txt
deleted file mode 100644
index da9d9fd1..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_OneRoom.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-last-generated=2015-11-23
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "3"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "8",
- "linear": " "
-}
-oriOutBot.port_a.m_flow=[-0.00794025510549545288, -0.00794025138020505034, -0.00794024765491464779, -0.00794024299830167063, -0.00794023927301126808, -0.00794023554772138596, -0.00794023089110788838, -0.00794022716581835319, -0.00794022250920534134, -0.00794021878391670821, -0.0079402150586254383, -0.00794021040201187134, -0.00794020667672032388, -0.00794020295142905397, -0.00794019829481867889, -0.00794019456953087843, -0.00794019084423613908, -0.007940186187625764, -0.00794018246233796354, -0.00794017873704322419, -0.00794017408043284911, -0.00794017035513810976, -0.00794016569852828979, -0.00794016197323993422, -0.00794015824794519487, -0.00794015359133481979, -0.00794014986604008044, -0.00794014614075921887, -0.0079401414841419049, -0.00794013775884716555, -0.00794013403356075287, -0.00794012937694899001, -0.00794012565165425066, -0.00794012099505081448, -0.00794011726975607512, -0.00794011354446133577, -0.00794010888785789959, -0.00794010516256316023, -0.00794010143726842088, -0.00794009678065110691, -0.00794009305537024535, -0.00794008933007550599, -0.00794008467345819202, -0.00794008094817733046, -0.0079400772228825911, -0.00794007256626527713, -0.00794006884098441557, -0.00794006418436765671, -0.00794006045907236224, -0.00794005673379150068, -0.00794005207717418671, -0.00794004835187944735, -0.007940044626584708, -0.00794003996996739403, -0.00794003624470041025, -0.00794003251940011978, -0.00794002786278835693, -0.00794002413749361757, -0.00794002041219887822, -0.00794001575558156425, -0.00794001203031458047, -0.0079400073736972665, -0.00794000364840252715, -0.00793999992310778779, -0.00793999526649047382, -0.00793999154119573447, -0.00793998781592875069, -0.00793998315931143672, -0.00793997943401669737, -0.00793997570872195801, -0.00793997105210464404, -0.00793996732680990469, -0.0079399626702203463, -0.00793995894492560694, -0.00793995521963086759, -0.00793995056301355362, -0.00793994683771881427, -0.00793994311242407491, -0.00793993845580676094, -0.00793993473053977716, -0.00793993100523948669, -0.00793992634862772384, -0.00793992262333298449, -0.00793991889803824513, -0.00793991424142093116, -0.00793991051615394738, -0.00793990585953663341, -0.00793990213424189406, -0.00793989840894715471, -0.00793989375233650208, -0.00793989002703510138, -0.0079398863017681176, -0.00793988164515080364, -0.00793987791985606428, -0.00793987419456132493, -0.00793986953794401096, -0.0079398658126492716, -0.00793986208736896515, -0.00793985743076497386, -0.0079398537054702345, -0.00793984904885292053]
-oriOutTop.port_a.m_flow=[0.00794025510549545288, 0.00794025138020505034, 0.00794024765491464779, 0.00794024299830167063, 0.00794023927301126808, 0.00794023554772138596, 0.00794023089110788838, 0.00794022716581835319, 0.00794022250920534134, 0.00794021878391670821, 0.0079402150586254383, 0.00794021040201187134, 0.00794020667672032388, 0.00794020295142905397, 0.00794019829481867889, 0.00794019456953087843, 0.00794019084423613908, 0.007940186187625764, 0.00794018246233796354, 0.00794017873704322419, 0.00794017408043284911, 0.00794017035513810976, 0.00794016569852828979, 0.00794016197323993422, 0.00794015824794519487, 0.00794015359133481979, 0.00794014986604008044, 0.00794014614075921887, 0.0079401414841419049, 0.00794013775884716555, 0.00794013403356075287, 0.00794012937694899001, 0.00794012565165425066, 0.00794012099505081448, 0.00794011726975607512, 0.00794011354446133577, 0.00794010888785789959, 0.00794010516256316023, 0.00794010143726842088, 0.00794009678065110691, 0.00794009305537024535, 0.00794008933007550599, 0.00794008467345819202, 0.00794008094817733046, 0.0079400772228825911, 0.00794007256626527713, 0.00794006884098441557, 0.00794006418436765671, 0.00794006045907236224, 0.00794005673379150068, 0.00794005207717418671, 0.00794004835187944735, 0.007940044626584708, 0.00794003996996739403, 0.00794003624470041025, 0.00794003251940011978, 0.00794002786278835693, 0.00794002413749361757, 0.00794002041219887822, 0.00794001575558156425, 0.00794001203031458047, 0.0079400073736972665, 0.00794000364840252715, 0.00793999992310778779, 0.00793999526649047382, 0.00793999154119573447, 0.00793998781592875069, 0.00793998315931143672, 0.00793997943401669737, 0.00793997570872195801, 0.00793997105210464404, 0.00793996732680990469, 0.0079399626702203463, 0.00793995894492560694, 0.00793995521963086759, 0.00793995056301355362, 0.00793994683771881427, 0.00793994311242407491, 0.00793993845580676094, 0.00793993473053977716, 0.00793993100523948669, 0.00793992634862772384, 0.00793992262333298449, 0.00793991889803824513, 0.00793991424142093116, 0.00793991051615394738, 0.00793990585953663341, 0.00793990213424189406, 0.00793989840894715471, 0.00793989375233650208, 0.00793989002703510138, 0.0079398863017681176, 0.00793988164515080364, 0.00793987791985606428, 0.00793987419456132493, 0.00793986953794401096, 0.0079398658126492716, 0.00793986208736896515, 0.00793985743076497386, 0.0079398537054702345, 0.00793984904885292053]
-time=[0., 1.]
-volEas.T=[293.149993896484375, 293.149993896484375, 293.14999389647755378974, 293.14996337890625, 293.14996337890625, 293.14993286133949368377, 293.149932861328125, 293.149932861328125, 293.14990234375, 293.14990234375, 293.14990234375, 293.149871826171875, 293.149871826171875, 293.149871826171875, 293.14984130859375, 293.14984130859375, 293.14984130859375, 293.149810791015625, 293.149810791015625, 293.149810791015625, 293.1497802734375, 293.1497802734375, 293.14978027341931010596, 293.149749755859375, 293.149749755859375, 293.149749755859375, 293.14971923828125, 293.14971923828125, 293.14968872072131489404, 293.149688720703125, 293.149688720703125, 293.14965820316137978807, 293.149658203125, 293.149658203125, 293.149627685546875, 293.149627685546875, 293.149627685546875, 293.14959716796875, 293.14959716796875, 293.14959716796875, 293.149566650390625, 293.149566650390625, 293.149566650390625, 293.1495361328125, 293.1495361328125, 293.1495361328125, 293.149505615234375, 293.149505615234375, 293.14950561507066595368, 293.14947509765625, 293.14947509765625, 293.14947509751073084772, 293.149444580078125, 293.149444580078125, 293.14941406282741809264, 293.1494140625, 293.1494140625, 293.149383544921875, 293.149383544921875, 293.149383544921875, 293.14935302734375, 293.14935302734375, 293.14935302734375, 293.149322509765625, 293.149322509765625, 293.149322509765625, 293.1492919921875, 293.1492919921875, 293.1492919921875, 293.149261474609375, 293.149261474609375, 293.149261474609375, 293.14923095703125, 293.14923095703125, 293.14923095703125, 293.149200439453125, 293.149200439453125, 293.149169921875, 293.149169921875, 293.149169921875, 293.14913940447877394035, 293.149139404296875, 293.149139404296875, 293.14910888671875, 293.14910888671875, 293.14910888671875, 293.149078369140625, 293.149078369140625, 293.149078369140625, 293.1490478515625, 293.1490478515625, 293.1490478515625, 293.149017333984375, 293.149017333984375, 293.149017333984375, 293.14898681640625, 293.14898681640625, 293.14898681640625, 293.148956298828125, 293.148956298828125, 293.148956298828125]
-volOut.T=[283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375]
-oriOutBot.dp=[-0.62177175283432006836, -0.62177109718321421639, -0.6217705011367531398, -0.62176984548564728783, -0.62176918983454143586, -0.62176859378819138158, -0.6217679381369745073, -0.62176728248598855942, -0.62176668643940757875, -0.62176603078863479368, -0.62176537513746232833, -0.62176477909084582052, -0.62176412343962894624, -0.62176346778841207197, -0.62176287174228406229, -0.62176221609151127723, -0.62176156043985031374, -0.62176096439372230407, -0.621760308742949519, -0.62175965309128855552, -0.62175905704516054584, -0.62175840139349958235, -0.62175774574272679729, -0.62175714969659878761, -0.62175649404493782413, -0.62175583839416503906, -0.62175524234714885097, -0.62175458669726424432, -0.62175393104563880797, -0.62175333499858709274, -0.6217526793487024861, -0.62175202369711257688, -0.62175142765002533451, -0.62175077200014072787, -0.62175011634858634579, -0.62174952030146357629, -0.62174886465157896964, -0.6217482090000601147, -0.62174761295290181806, -0.62174695730124085458, -0.62174630165153388361, -0.62174570560434005984, -0.62174504995267909635, -0.62174439430300765252, -0.62174379825577830161, -0.62174314260411733812, -0.62174248695448142144, -0.62174189090721654338, -0.6217412352555555799, -0.62174057960595519035, -0.62173998355865478516, -0.62173932790699382167, -0.62173867225533285819, -0.62173807620831667009, -0.62173742056020842028, -0.62173676490890272817, -0.6217361688615312687, -0.62173551320987030522, -0.62173485755820934173, -0.62173426151119315364, -0.62173360586308490383, -0.62173295021185026599, -0.62173235416440775225, -0.62173169851274678877, -0.62173104286108582528, -0.62173044681406963718, -0.62172979116596138738, -0.62172913551479780381, -0.6217285394672842358, -0.62172788381562327231, -0.62172722816396230883, -0.62172663211694612073, -0.62172597646883787093, -0.62172532081774534163, -0.62172472477016071934, -0.62172406911849975586, -0.62172341346683879237, -0.62172281741982260428, -0.62172216176816164079, -0.62172150612069287945, -0.62172091007303720289, -0.62172025442137623941, -0.62171959876971527592, -0.62171900272269908783, -0.62171834707103812434, -0.62171769142364041727, -0.62171709537591368644, -0.62171643972425272295, -0.62171578407259175947, -0.62171518802557557137, -0.62171453237391460789, -0.62171387672658795509, -0.62171328067879016999, -0.6217126250271292065, -0.62171196937546824302, -0.62171137332845205492, -0.62171071767679109144, -0.62171006202953549291, -0.62170946598166665353, -0.62170881033000569005, -0.62170815467834472656]
-oriOutTop.dp=[0.62177175283432006836, 0.62177109718321421639, 0.6217705011367531398, 0.62176984548564728783, 0.62176918983454143586, 0.62176859378819138158, 0.6217679381369745073, 0.62176728248598855942, 0.62176668643940757875, 0.62176603078863479368, 0.62176537513746232833, 0.62176477909084582052, 0.62176412343962894624, 0.62176346778841207197, 0.62176287174228406229, 0.62176221609151127723, 0.62176156043985031374, 0.62176096439372230407, 0.621760308742949519, 0.62175965309128855552, 0.62175905704516054584, 0.62175840139349958235, 0.62175774574272679729, 0.62175714969659878761, 0.62175649404493782413, 0.62175583839416503906, 0.62175524234714885097, 0.62175458669726424432, 0.62175393104563880797, 0.62175333499858709274, 0.6217526793487024861, 0.62175202369711257688, 0.62175142765002533451, 0.62175077200014072787, 0.62175011634858634579, 0.62174952030146357629, 0.62174886465157896964, 0.6217482090000601147, 0.62174761295290181806, 0.62174695730124085458, 0.62174630165153388361, 0.62174570560434005984, 0.62174504995267909635, 0.62174439430300765252, 0.62174379825577830161, 0.62174314260411733812, 0.62174248695448142144, 0.62174189090721654338, 0.6217412352555555799, 0.62174057960595519035, 0.62173998355865478516, 0.62173932790699382167, 0.62173867225533285819, 0.62173807620831667009, 0.62173742056020842028, 0.62173676490890272817, 0.6217361688615312687, 0.62173551320987030522, 0.62173485755820934173, 0.62173426151119315364, 0.62173360586308490383, 0.62173295021185026599, 0.62173235416440775225, 0.62173169851274678877, 0.62173104286108582528, 0.62173044681406963718, 0.62172979116596138738, 0.62172913551479780381, 0.6217285394672842358, 0.62172788381562327231, 0.62172722816396230883, 0.62172663211694612073, 0.62172597646883787093, 0.62172532081774534163, 0.62172472477016071934, 0.62172406911849975586, 0.62172341346683879237, 0.62172281741982260428, 0.62172216176816164079, 0.62172150612069287945, 0.62172091007303720289, 0.62172025442137623941, 0.62171959876971527592, 0.62171900272269908783, 0.62171834707103812434, 0.62171769142364041727, 0.62171709537591368644, 0.62171643972425272295, 0.62171578407259175947, 0.62171518802557557137, 0.62171453237391460789, 0.62171387672658795509, 0.62171328067879016999, 0.6217126250271292065, 0.62171196937546824302, 0.62171137332845205492, 0.62171071767679109144, 0.62171006202953549291, 0.62170946598166665353, 0.62170881033000569005, 0.62170815467834472656]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_Orifice.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_Orifice.txt
deleted file mode 100644
index 3b40cba6..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_Orifice.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'number of continuous time states': '3', 'linear': ' '}
-ori.V_flow=[0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16782927513122558594, 0.16443843812179845254, 0.16097619014112701796, 0.15743781668782388938, 0.15381806782516260768, 0.15011106877739682774, 0.14631016644006847316, 0.14240786149490111678, 0.13839556808996342219, 0.13426342756128534228, 0.12999999264010669853, 0.12559194012096366877, 0.12102341873024520524, 0.11627553171389352904, 0.11132533866150902402, 0.10614455806074191146, 0.1006975675371638429, 0.0949385683913942513, 0.08880690935755072846, 0.08221921905048978907, 0.07505552311884731986, 0.06713171994967766232, 0.05813776584187443225, 0.04732449380110406723, 0.02920709702121354612, 0., -0.02920709702088562787, -0.04732453164878822061, -0.05813779429140826516, -0.06713169479601931167, -0.07505552311898204543, -0.0822192190504652809, -0.08880690935748357384, -0.09493858606301799896, -0.10069758413988506851, -0.10614454219596534956, -0.11132533866161738179, -0.11627553171392809861, -0.12102341873021225938, -0.12559194012086841163, -0.13000000552881707527, -0.13426341502733263322, -0.13839555595473906902, -0.14240786149494341628, -0.14631016644008210115, -0.15011106877733032539, -0.15381807872835523421, -0.15743780600203963194, -0.16097617970547115074, -0.16443843812184724684, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594, -0.16782927513122558594]
-time=[0., 1.]
-ori.dp=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0.95999994039563940618, 0.92000005960432496011, 0.87999999999999989342, 0.8399999403956039945, 0.8000000596046448198, 0.76000000000000000888, 0.71999999999999997335, 0.68000005960464471322, 0.6399999999999999023, 0.60000000000000008882, 0.56000005960464482868, 0.52000000000000001776, 0.47999997019774864881, 0.43999994039556833414, 0.40000002980223348104, 0.3600000000000000977, 0.31999994039555068603, 0.28000002980221583293, 0.23999998509885656084, 0.19999995529660519189, 0.16000002980226013527, 0.11999999254943283233, 0.07999995529659642557, 0.04000003725283196587, 0., -0.04000003725226354556, -0.08000007450452709112, -0.12000011175689720422, -0.15999991059447180031, -0.19999995529731595667, -0.23999998509871467434, -0.28000002980178928524, -0.32000005960364985569, -0.36000011920733548942, -0.39999991059445383357, -0.43999994039642098542, -0.47999997019803286591, -0.51999999999971580067, -0.5600000596037921774, -0.60000011920715801139, -0.63999988079305536459, -0.67999994039635014431, -0.72000000000042652104, -0.76000000000014189538, -0.80000005960393405502, -0.84000005960336565636, -0.8799998807924156452, -0.91999994039649202193, -0.95999994039620784037, -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1.]
-ori.v=[0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.83914637565612792969, 0.82219217570790215088, 0.80488093580447395148, 0.78718906853799375245, 0.76909033912581303838, 0.75055535878814538808, 0.73155087690377262888, 0.71203933727672141796, 0.69197788515320302061, 0.67131710800413102458, 0.64999996320053343712, 0.62795970060471184571, 0.6051170936511371945, 0.58137767347059332579, 0.55662670075823228455, 0.5307228126552736569, 0.50348781533411735012, 0.47469284195702010631, 0.44403456913941552475, 0.41109608780186840393, 0.3752776230447728012, 0.3356585848473203626, 0.29068883665994388332, 0.23662246900560024443, 0.14603548324341369957, 0., -0.14603548324177409445, -0.23662265824401218506, -0.29068897890746209223, -0.33565845907901525891, -0.37527762304544642902, -0.41109608780174583531, -0.44403456913907968229, -0.47469293031527648452, -0.50348789834748819416, -0.53072273333085806524, -0.55662670075877407339, -0.58137767347076607649, -0.6051170936509724374, -0.62795970060423544901, -0.65000002764390774068, -0.67131704533414549019, -0.69197782447693023666, -0.71203933727693291544, -0.73155087690384079657, -0.75055535878781276526, -0.76909039364129661021, -0.78718901510861072346, -0.80488088362676302179, -0.82219217570814606688, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969, -0.83914637565612792969]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_ReverseBuoyancy.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_ReverseBuoyancy.txt
deleted file mode 100644
index aef81265..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_ReverseBuoyancy.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-last-generated=2016-03-15
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "20",
- "linear": " "
-}
-oriWesTop.port_a.m_flow=[0.05965141952037811279, 0.0031595833133906126, 0.0027947230264544487, 0.00246961647644639015, 0.00217371108010411263, 0.00190671475138515234, 0.00167047581635415554, 0.00145873043220490196, 0.00127121468540281057, 0.00110167067032307386, 0.00094822503160685301, 0.00080780958523973823, 0.00067858613329008222, 0.00055753428023308516, 0.0004447135434020309, 0.00033943308517336845, 0.00024148447846528143, 0.00015030104259494692, 0.00006600957567570731, -0.00001127220821217634, -0.00008156627154676244, -0.00014510985056404024, -0.00020217873679939657, -0.00025322887813672423, -0.00029869843274354935, -0.00033916620304808021, -0.00037508239620365202, -0.00040687446016818296, -0.00043496830039657663, -0.00045978743582963943, -0.00048157555283978581, -0.00050074420869350433, -0.00051798298954963684, -0.00053343368927016854, -0.00054723717039451003, -0.00055953330593183637, -0.00057046115398406982, -0.00058015889953821898, -0.00058876420371234417, -0.00059641385450959206, -0.00060324434889480472, -0.00060939154354855418, -0.00061499106232076883, -0.0006201108917593956, -0.00062477122992277145, -0.00062908016843721271, -0.00063305592630058527, -0.00063671666430309415, -0.00064008054323494434, -0.00064316566567867994, -0.00064599013421684504, -0.00064857187680900097, -0.00065092899603769183, -0.00065307941986247897, -0.00065504113445058465, -0.00065683206776157022, -0.00065847003133967519, -0.00065997306955978274, -0.00066135905217379332, -0.00066262576729059219, -0.00066378043266013265, -0.00066483003320172429, -0.00066577846882864833, -0.00066662963945418596, -0.00066738738678395748, -0.00066805555252358317, -0.00066863797837868333, -0.00066913856426253915, -0.00066956109367311001, -0.0006699094083160162, -0.00067018740810453892, -0.00067039887653663754, -0.00067054765531793237, -0.00067063764436170459, -0.00067066954215988517, -0.0006706385756842792, -0.00067056022817268968, -0.00067043578019365668, -0.00067026645410805941, -0.00067005364689975977, -0.00066979852272197604, -0.00066950236214324832, -0.00066916650393977761, -0.00066879211226478219, -0.00066838058410212398, -0.00066793308360502124, -0.00066745094954967499, -0.00066693534608930349, -0.00066638767020776868, -0.00066580908605828881, -0.00066520093241706491, -0.00066456437343731523, -0.0006639008061029017, -0.00066321133635938168, -0.00066249736119061708, -0.00066176010295748711, -0.00066100084222853184, -0.00066022080136463046, -0.00065942120272666216, -0.00065860344329848886, -0.00065776862902566791]
-dooOpeClo.mBA_flow=[0.2152271270751953125, 0.28249666094779968262, 0.23859944939613342285, 0.2032696157693862915, 0.17571911215782165527, 0.15391704440116882324, 0.13624200224876403809, 0.12146610766649244828, 0.1087431684136390686, 0.0981195494532585144, 0.08942057937383651733, 0.08239787071943283081, 0.07764822244644165039, 0.07736372947692871094, 0.07745508104562759399, 0.07746800035238265991, 0.07730301469564437866, 0.07748826593160629272, 0.07991012930870056152, 0.08310085535049438477, 0.08628980815410614014, 0.08935200423002243042, 0.09221690893173217773, 0.09473990648984909058, 0.09694874286651611328, 0.09891587495803833008, 0.10065218806266784668, 0.10217026621103286743, 0.10348603129386901855, 0.10461849719285964966, 0.10557726770639419556, 0.10638486593961715698, 0.10708438605070114136, 0.10768301784992218018, 0.10818837583065032959, 0.10860846936702728271, 0.10895152390003204346, 0.10922598093748092651, 0.10944040864706039429, 0.10960344970226287842, 0.10972383618354797363, 0.10981032997369766235, 0.10987173020839691162, 0.1099124029278755188, 0.10993277281522750854, 0.10993947088718414307, 0.10993345081806182861, 0.10991568863391876221, 0.1098871380090713501, 0.10984877496957778931, 0.10980157554149627686, 0.10974650084972381592, 0.10968453437089920044, 0.10961664468050003052, 0.1095438152551651001, 0.10946701467037200928, 0.109387226402759552, 0.10930542647838592529, 0.10922259092330932617, 0.10913853347301483154, 0.10905324667692184448, 0.10896695405244827271, 0.1088797450065612793, 0.10879170149564743042, 0.10870291292667388916, 0.10861346125602722168, 0.10852343589067459106, 0.10843291878700256348, 0.108341999351978302, 0.1082507595419883728, 0.10815928131341934204, 0.1080676540732383728, 0.10797596722841262817, 0.10788429528474807739, 0.10779269784688949585, 0.10770106315612792969, 0.10760954767465591431, 0.10751814395189285278, 0.10742686688899993896, 0.10733572393655776978, 0.10724471509456634521, 0.10715384781360626221, 0.10706312209367752075, 0.1069725528359413147, 0.10688214004039764404, 0.10679189115762710571, 0.10670181363821029663, 0.1066119074821472168, 0.10652217268943786621, 0.10643263161182403564, 0.10634327679872512817, 0.10625412315130233765, 0.10616516321897506714, 0.1060764119029045105, 0.10598786920309066772, 0.10589954257011413574, 0.10581143945455551147, 0.10572355985641479492, 0.10563591867685317993, 0.10554850846529006958, 0.10546134412288665771]
-oriOutBot.port_a.m_flow=[0.36645078659057617188, -0.00905612017959356308, -0.0089591052383184433, -0.0088893398642539978, -0.00883631687611341476, -0.00879388861358165741, -0.0087586110457777977, -0.00872826017439365387, -0.00870155356824398041, -0.00867739971727132797, -0.0086552593857049942, -0.00863465853035449982, -0.00861520785838365555, -0.00859666243195533752, -0.00857890583574771881, -0.00856187101453542709, -0.00854551512748003006, -0.0085297711193561554, -0.00851464644074440002, -0.00850014947354793549, -0.00848626252263784409, -0.00847295764833688736, -0.00846021343022584915, -0.00844799261540174484, -0.00843625888228416443, -0.00842496380209922791, -0.00841407105326652527, -0.0084035433828830719, -0.00839334446936845779, -0.00838343705981969833, -0.00837380066514015198, -0.00836439896374940872, -0.0083551676943898201, -0.00834609568119049072, -0.00833717081695795059, -0.00832838192582130432, -0.00831971596926450729, -0.00831116177141666412, -0.00830270629376173019, -0.00829433836042881012, -0.0082860458642244339, -0.00827781669795513153, -0.00826963689178228378, -0.00826150178909301758, -0.0082534104585647583, -0.0082453535869717598, -0.00823733024299144745, -0.00822933763265609741, -0.00822137575596570969, -0.00821344368159770966, -0.00820553861558437347, -0.00819765962660312653, -0.0081898057833313942, -0.00818197615444660187, -0.0081741679459810257, -0.00816638115793466568, -0.00815861299633979797, -0.00815086346119642258, -0.00814313068985939026, -0.00813541468232870102, -0.00812771543860435486, -0.00812003295868635178, -0.00811236631125211716, -0.00810471642762422562, -0.00809708237648010254, -0.00808946415781974792, -0.00808186177164316177, -0.00807427521795034409, -0.00806670449674129486, -0.00805914867669343948, -0.00805160775780677795, -0.00804408267140388489, -0.00803657248616218567, -0.00802907627075910568, -0.00802159588783979416, -0.00801412947475910187, -0.00800667796283960342, -0.00799924135208129883, -0.00799181871116161346, -0.00798441097140312195, -0.00797701720148324966, -0.00796963833272457123, -0.00796227343380451202, -0.00795492250472307205, -0.00794758647680282593, -0.00794026441872119904, -0.00793295633047819138, -0.00792566221207380295, -0.00791838299483060837, -0.0079111168161034584, -0.00790386553853750229, -0.00789662823081016541, -0.00788940489292144775, -0.00788219459354877472, -0.00787499919533729553, -0.00786781683564186096, -0.00786064844578504562, -0.00785349402576684952, -0.00784635357558727264, -0.00783922616392374039, -0.00783211272209882736]
-dooOpeClo.mAB_flow=[0.50730460882186889648, 0.28565606474876403809, 0.24139204621315002441, 0.20573939383029937744, 0.17789267003536224365, 0.15582448244094848633, 0.13791157305240631104, 0.12292558699846266312, 0.11001418530941009521, 0.09921987354755401611, 0.09036961942911148071, 0.08320600539445877075, 0.07832649350166320801, 0.07792139798402786255, 0.0778997763991355896, 0.07780742645263671875, 0.07754447311162948608, 0.07763857394456863403, 0.07997602224349975586, 0.08308956772089004517, 0.08620823174715042114, 0.0892068520188331604, 0.09201471507549285889, 0.09448671340942382812, 0.09665007889270782471, 0.09857651591300964355, 0.10027680546045303345, 0.10176326334476470947, 0.10305126756429672241, 0.10415903478860855103, 0.10509576648473739624, 0.10588422417640686035, 0.10656633973121643066, 0.10714930295944213867, 0.10764069855213165283, 0.10804843157529830933, 0.10838063061237335205, 0.10864556580781936646, 0.10885164141654968262, 0.10900729894638061523, 0.10912106186151504517, 0.1092014610767364502, 0.10925704985857009888, 0.10929229855537414551, 0.10930801182985305786, 0.10931038856506347656, 0.10930038243532180786, 0.10927894711494445801, 0.10924702882766723633, 0.10920557379722595215, 0.10915555059909820557, 0.10909790545701980591, 0.10903359204530715942, 0.10896357148885726929, 0.10888879746198654175, 0.10881021618843078613, 0.10872879624366760254, 0.10864548385143280029, 0.10856124013662338257, 0.10847590863704681396, 0.10838946700096130371, 0.10830212384462356567, 0.10821396112442016602, 0.10812506824731826782, 0.10803551971912384033, 0.10794540494680404663, 0.10785479843616485596, 0.10776378214359283447, 0.10767243802547454834, 0.10758084803819656372, 0.1074891015887260437, 0.1073972657322883606, 0.10730542242527008057, 0.10721366852521896362, 0.10712203383445739746, 0.10703042894601821899, 0.10693898797035217285, 0.10684771090745925903, 0.10675660520792007446, 0.10666567087173461914, 0.10657491534948348999, 0.10648433864116668701, 0.10639395564794540405, 0.10630375891923904419, 0.10621375590562820435, 0.10612395405769348145, 0.10603436082601547241, 0.10594496876001358032, 0.1058557853102684021, 0.10576682537794113159, 0.10567808151245117188, 0.10558956116437911987, 0.10550126433372497559, 0.10541320592164993286, 0.10532537847757339478, 0.10523778945207595825, 0.10515044629573822021, 0.10506334900856018066, 0.10497650504112243652, 0.10488991439342498779, 0.1048035845160484314]
-oriOutTop.port_a.m_flow=[0.36663854122161865234, 0.00905568338930606842, 0.00895886030048131943, 0.00888920482248067856, 0.00883625447750091553, 0.00879385974258184433, 0.00875860173255205154, 0.00872828904539346695, 0.00870159268379211426, 0.00867745000869035721, 0.00865531433373689651, 0.00863472186028957367, 0.00861527305096387863, 0.00859673228114843369, 0.00857897847890853882, 0.00856194645166397095, 0.00854559242725372314, 0.00852985028177499771, 0.00851472839713096619, 0.00850023422390222549, 0.00848635006695985794, 0.00847304705530405045, 0.00846030563116073608, 0.00844808667898178101, 0.00843635573983192444, 0.00842506252229213715, 0.00841417163610458374, 0.0084036458283662796, 0.00839344784617424011, 0.00838354136794805527, 0.00837390590459108353, 0.00836450420320034027, 0.00835527386516332626, 0.0083462027832865715, 0.00833727791905403137, 0.0083284890279173851, 0.00831982307136058807, 0.0083112688735127449, 0.00830281432718038559, 0.00829444639384746552, 0.00828615389764308929, 0.00827792380005121231, 0.00826974492520093918, 0.00826160982251167297, 0.00825351756066083908, 0.00824546068906784058, 0.00823743641376495361, 0.00822944473475217819, 0.00822148285806179047, 0.00821354985237121582, 0.00820564385503530502, 0.00819776579737663269, 0.00818991102278232574, 0.00818208139389753342, 0.00817427318543195724, 0.00816648546606302261, 0.00815871823579072952, 0.00815096776932477951, 0.00814323499798774719, 0.00813551805913448334, 0.00812781881541013718, 0.00812013540416955948, 0.00811246875673532486, 0.00810481887310743332, 0.00809718389064073563, 0.00808956567198038101, 0.00808196328580379486, 0.00807437673211097717, 0.00806680507957935333, 0.00805924925953149796, 0.00805170834064483643, 0.00804418325424194336, 0.00803667213767766953, 0.00802917592227458954, 0.00802169553935527802, 0.00801422912627458572, 0.00800677668303251266, 0.00799934007227420807, 0.00799191743135452271, 0.00798450876027345657, 0.00797711499035358429, 0.00796973519027233124, 0.00796237029135227203, 0.00795501936227083206, 0.00794768240302801132, 0.00794036034494638443, 0.00793305225670337677, 0.00792575813829898834, 0.00791847798973321915, 0.0079112127423286438, 0.00790396053344011307, 0.00789672322571277618, 0.00788949895650148392, 0.00788228865712881088, 0.0078750932589173317, 0.00786791089922189713, 0.00786074250936508179, 0.00785358715802431107, 0.00784644577652215958, 0.00783931836485862732, 0.00783220492303371429]
-time=[0., 3600.]
-oriEasTop.port_a.m_flow=[-0.05945066735148429871, 0.00315982941538095474, 0.00279468786902725697, 0.00246984767727553844, 0.00217335857450962067, 0.00190726388245820999, 0.00166935042943805456, 0.00145920016802847364, 0.0012711862800642848, 0.0011017464566975832, 0.00094827025895938277, 0.00080836319830268621, 0.00067826546728610992, 0.00055757333757355809, 0.00044462527148425563, 0.00033934388193301857, 0.00024139329616446048, 0.0001502086961409077, 0.00006591609417228028, -0.00001136734226747649, -0.0000816630563349463, -0.00014520827971864492, -0.00020227865024935454, -0.00025333015946671367, -0.00029880093643441796, -0.00033927001641131938, -0.00037518725730478764, -0.00040698004886507999, -0.00043507432565093051, -0.00045989392674528062, -0.00048168274224735796, -0.00050085171824321151, -0.00051809090655297041, -0.00053354201372712851, -0.00054734578588977456, -0.00055964203784242272, -0.00057056982768699527, -0.00058026745682582259, -0.00058887246996164322, -0.00059652182972058654, -0.00060335203306749463, -0.00060949899489060044, -0.00061509851366281509, -0.00062021834310144186, -0.00062487850664183497, -0.00062918727053329349, -0.0006331627955660224, -0.00063682330073788762, -0.00064018694683909416, -0.00064327183645218611, -0.00064609601395204663, -0.00064867752371355891, -0.00065103429369628429, -0.00065318442648276687, -0.00065514579182490706, -0.00065693643409758806, -0.00065857410663738847, -0.00066007691202685237, -0.00066146260360255837, -0.0006627290858887136, -0.00066388346021994948, -0.00066493276972323656, -0.00066588097251951694, -0.00066673191031441092, -0.00066748936660587788, -0.000668157241307199, -0.00066873937612399459, -0.00066923961276188493, -0.00066966185113415122, -0.00067000987473875284, -0.00067028758348897099, -0.00067049876088276505, -0.00067064730683341622, -0.00067073700483888388, -0.0006707686698064208, -0.00067073735408484936, -0.00067065871553495526, -0.00067053403472527862, -0.00067036447580903769, -0.00067015143577009439, -0.00066989613696932793, -0.00066959974355995655, -0.00066926365252584219, -0.00066888908622786403, -0.00066847726702690125, -0.00066802953369915485, -0.00066754710860550404, -0.00066703121410682797, -0.00066648318897932768, -0.00066590431379154325, -0.00066529581090435386, -0.0006646589026786387, -0.00066399498609825969, -0.0006633052253164351, -0.00066259090090170503, -0.00066185335163027048, -0.00066109374165534973, -0.0006603134679608047, -0.00065951369469985366, -0.00065869576064869761, -0.00065786094637587667]
-volOut.T=[283.149993896484375, 283.149993896484375]
-volBotWes.T=[295.149993896484375, 294.3328857421875, 294.56591796875, 294.715972900390625, 294.8160400390625, 294.8851318359375, 294.933624267578125, 294.9681396484375, 294.9925537109375, 295.009979248046875, 295.022003173828125, 295.029998779296875, 295.035064697265625, 295.037872314453125, 295.038787841796875, 295.0379638671875, 295.035491943359375, 295.031585693359375, 295.02618408203125, 295.019256591796875, 295.0107421875, 295.00067138671875, 294.989044189453125, 294.97607421875, 294.9617919921875, 294.94635009765625, 294.929901123046875, 294.912506103515625, 294.894287109375, 294.8753662109375, 294.855804443359375, 294.835662841796875, 294.815155029296875, 294.7943115234375, 294.773162841796875, 294.751739501953125, 294.7301025390625, 294.708251953125, 294.68621826171875, 294.6640625, 294.641815185546875, 294.6195068359375, 294.59716796875, 294.574798583984375, 294.55242919921875, 294.530059814453125, 294.507720947265625, 294.48541259765625, 294.463134765625, 294.44085693359375, 294.41864013671875, 294.39642333984375, 294.374267578125, 294.3521728515625, 294.330108642578125, 294.308074951171875, 294.2861328125, 294.26422119140625, 294.24237060546875, 294.2205810546875, 294.198883056640625, 294.177215576171875, 294.155609130859375, 294.134063720703125, 294.112579345703125, 294.091156005859375, 294.06982421875, 294.04852294921875, 294.02728271484375, 294.006103515625, 293.9849853515625, 293.96392822265625, 293.942962646484375, 293.922027587890625, 293.901153564453125, 293.88037109375, 293.859619140625, 293.83892822265625, 293.818328857421875, 293.797760009765625, 293.777252197265625, 293.7568359375, 293.7364501953125, 293.71612548828125, 293.69586181640625, 293.675689697265625, 293.655548095703125, 293.635467529296875, 293.615447998046875, 293.595489501953125, 293.575592041015625, 293.55572509765625, 293.53594970703125, 293.5162353515625, 293.496551513671875, 293.476959228515625, 293.4573974609375, 293.437896728515625, 293.41845703125, 293.399078369140625, 293.3797607421875]
-volBotEas.T=[298.149993896484375, 296.47955322265625, 296.182708740234375, 295.971527099609375, 295.81231689453125, 295.685699462890625, 295.5809326171875, 295.491241455078125, 295.41259765625, 295.341705322265625, 295.27691650390625, 295.216796875, 295.16021728515625, 295.10638427734375, 295.054962158203125, 295.005767822265625, 294.9586181640625, 294.913360595703125, 294.86993408203125, 294.82843017578125, 294.78875732421875, 294.75079345703125, 294.714508056640625, 294.67974853515625, 294.646453857421875, 294.61444091796875, 294.5836181640625, 294.55389404296875, 294.525115966796875, 294.4971923828125, 294.4700927734375, 294.44366455078125, 294.417755126953125, 294.392333984375, 294.367340087890625, 294.3427734375, 294.318572998046875, 294.29473876953125, 294.27117919921875, 294.247894287109375, 294.224853515625, 294.201995849609375, 294.1793212890625, 294.156768798828125, 294.1343994140625, 294.11212158203125, 294.0899658203125, 294.06793212890625, 294.0460205078125, 294.024200439453125, 294.002471923828125, 293.9808349609375, 293.959320068359375, 293.9378662109375, 293.91650390625, 293.89520263671875, 293.8740234375, 293.852874755859375, 293.831817626953125, 293.810821533203125, 293.789886474609375, 293.76904296875, 293.74822998046875, 293.727508544921875, 293.70684814453125, 293.686248779296875, 293.665740966796875, 293.645263671875, 293.624847412109375, 293.604522705078125, 293.584259033203125, 293.56402587890625, 293.54388427734375, 293.5238037109375, 293.503753662109375, 293.483795166015625, 293.463897705078125, 293.44403076171875, 293.42425537109375, 293.404541015625, 293.384857177734375, 293.365234375, 293.345703125, 293.326202392578125, 293.3067626953125, 293.287384033203125, 293.26806640625, 293.248809814453125, 293.2296142578125, 293.210479736328125, 293.191375732421875, 293.172332763671875, 293.15338134765625, 293.13446044921875, 293.1156005859375, 293.096771240234375, 293.078033447265625, 293.059326171875, 293.040679931640625, 293.0220947265625, 293.003570556640625]
-volTopEas.T=[294.149993896484375, 292.98614501953125, 292.952911376953125, 292.92340087890625, 292.89703369140625, 292.87335205078125, 292.85198974609375, 292.832611083984375, 292.81500244140625, 292.79888916015625, 292.784149169921875, 292.77056884765625, 292.758056640625, 292.7464599609375, 292.7357177734375, 292.725738525390625, 292.716400146484375, 292.707672119140625, 292.699493408203125, 292.691802978515625, 292.6845703125, 292.677825927734375, 292.67144775390625, 292.66546630859375, 292.659820556640625, 292.654510498046875, 292.64947509765625, 292.64471435546875, 292.640228271484375, 292.635955810546875, 292.631927490234375, 292.62811279296875, 292.62445068359375, 292.6209716796875, 292.61767578125, 292.614532470703125, 292.61151123046875, 292.608673095703125, 292.605926513671875, 292.60333251953125, 292.600830078125, 292.59844970703125, 292.59619140625, 292.593994140625, 292.5919189453125, 292.58990478515625, 292.587982177734375, 292.58612060546875, 292.584320068359375, 292.582611083984375, 292.58099365234375, 292.57940673828125, 292.577911376953125, 292.576446533203125, 292.5750732421875, 292.57373046875, 292.572479248046875, 292.571258544921875, 292.570068359375, 292.568939208984375, 292.56787109375, 292.56683349609375, 292.56585693359375, 292.564910888671875, 292.563995361328125, 292.563140869140625, 292.56231689453125, 292.561492919921875, 292.560760498046875, 292.560028076171875, 292.559326171875, 292.55865478515625, 292.558013916015625, 292.55743408203125, 292.556854248046875, 292.556304931640625, 292.555755615234375, 292.555267333984375, 292.554779052734375, 292.5543212890625, 292.553863525390625, 292.553466796875, 292.55303955078125, 292.55267333984375, 292.55230712890625, 292.55194091796875, 292.5516357421875, 292.551300048828125, 292.550994873046875, 292.55072021484375, 292.550445556640625, 292.550201416015625, 292.549957275390625, 292.549713134765625, 292.54949951171875, 292.549285888671875, 292.549102783203125, 292.54888916015625, 292.548736572265625, 292.548553466796875, 292.54840087890625]
-volTopWes.T=[293.149993896484375, 292.06683349609375, 292.103118896484375, 292.13519287109375, 292.163665771484375, 292.189117431640625, 292.21197509765625, 292.232574462890625, 292.25128173828125, 292.268280029296875, 292.283782958984375, 292.2979736328125, 292.31103515625, 292.323028564453125, 292.3341064453125, 292.3443603515625, 292.353851318359375, 292.362701416015625, 292.3709716796875, 292.378662109375, 292.385894775390625, 292.392730712890625, 292.399200439453125, 292.40533447265625, 292.411102294921875, 292.416595458984375, 292.421844482421875, 292.426788330078125, 292.4315185546875, 292.43603515625, 292.4403076171875, 292.44439697265625, 292.448333740234375, 292.45208740234375, 292.455657958984375, 292.4591064453125, 292.46240234375, 292.465545654296875, 292.46856689453125, 292.471466064453125, 292.4742431640625, 292.4769287109375, 292.4794921875, 292.48199462890625, 292.484375, 292.486663818359375, 292.4888916015625, 292.491058349609375, 292.493133544921875, 292.4951171875, 292.497039794921875, 292.4989013671875, 292.500701904296875, 292.502410888671875, 292.50408935546875, 292.505706787109375, 292.507232666015625, 292.50872802734375, 292.51019287109375, 292.511566162109375, 292.512908935546875, 292.514190673828125, 292.51544189453125, 292.516632080078125, 292.517791748046875, 292.5189208984375, 292.519989013671875, 292.521026611328125, 292.52203369140625, 292.522979736328125, 292.52392578125, 292.524810791015625, 292.525665283203125, 292.5264892578125, 292.52728271484375, 292.528045654296875, 292.52880859375, 292.529510498046875, 292.53021240234375, 292.530853271484375, 292.531494140625, 292.532135009765625, 292.53271484375, 292.533294677734375, 292.533843994140625, 292.53436279296875, 292.534881591796875, 292.535369873046875, 292.535858154296875, 292.53631591796875, 292.5367431640625, 292.53717041015625, 292.537567138671875, 292.537933349609375, 292.538330078125, 292.538665771484375, 292.539031982421875, 292.539337158203125, 292.5396728515625, 292.53997802734375, 292.540252685546875]
-dooOpeClo.dpAB[1]=[0.16304393112659454346, 0.08884292840957641602, 0.06774210184812545776, 0.05340586230158805847, 0.04316202178597450256, 0.03546060621738433838, 0.02944871224462985992, 0.02458814904093742024, 0.02056319080293178558, 0.01711922697722911835, 0.01412774529308080673, 0.01147893071174621582, 0.0090822288766503334, 0.0068826405331492424, 0.00485249003395437847, 0.00297695002518594265, 0.00124577025417238474, -0.00035587704041972756, -0.00182666629552841187, -0.00316449557431042194, -0.00436977623030543327, -0.00544712832197546959, -0.00640174653381109238, -0.00724263489246368408, -0.00797832198441028595, -0.00861976388841867447, -0.00917563121765851974, -0.00965420342981815512, -0.01006377022713422949, -0.0104126250371336937, -0.01070541422814130783, -0.01095025520771741867, -0.01116105355322360992, -0.01134044583886861801, -0.0114910714328289032, -0.01161557063460350037, -0.01171658653765916824, -0.0117967650294303894, -0.01185875572264194489, -0.01190520729869604111, -0.01193877309560775757, -0.01196210924535989761, -0.01197787374258041382, -0.01198739185929298401, -0.01199081819504499435, -0.01199013367295265198, -0.01198563072830438614, -0.01197759900242090225, -0.01196633186191320419, -0.01195212081074714661, -0.01193525735288858414, -0.01191603485494852066, -0.01189474575221538544, -0.01187168341130018234, -0.01184714026749134064, -0.01182141061872243881, -0.01179478783160448074, -0.01176756527274847031, -0.01174003910273313522, -0.01171215251088142395, -0.01168390084058046341, -0.01165535207837820053, -0.01162653230130672455, -0.01159746665507555008, -0.01156817935407161713, -0.01153869647532701492, -0.01150904316455125809, -0.01147924549877643585, -0.0114493267610669136, -0.01141931395977735519, -0.01138923224061727524, -0.01135910581797361374, -0.01132896170020103455, -0.01129882410168647766, -0.01126870792359113693, -0.01123858150094747543, -0.01120848860591650009, -0.01117843110114336014, -0.01114840991795063019, -0.01111842598766088486, -0.01108848210424184799, -0.01105857919901609421, -0.0110287172719836235, -0.01099890004843473434, -0.01096912659704685211, -0.01093939971178770065, -0.0109097212553024292, -0.01088009122759103775, -0.01085051242262125015, -0.01082098484039306641, -0.01079151034355163574, -0.01076209172606468201, -0.01073272805660963058, -0.01070342306047677994, -0.01067417673766613007, -0.0106449909508228302, -0.01061586663126945496, -0.01058680564165115356, -0.01055780891329050064, -0.01052887924015522003, -0.01050001569092273712]
-oriOutBot.dp=[1324.3212890625, -0.80880975723266601562, -0.79157358407974243164, -0.77929347753524780273, -0.77002465724945068359, -0.76264768838882446289, -0.75654101371765136719, -0.75130689144134521484, -0.74671638011932373047, -0.74257659912109375, -0.73879200220108032227, -0.73527938127517700195, -0.73197042942047119141, -0.72882258892059326172, -0.7258148193359375, -0.72293531894683837891, -0.72017574310302734375, -0.71752458810806274414, -0.71498221158981323242, -0.71254974603652954102, -0.71022343635559082031, -0.70799809694290161133, -0.70586991310119628906, -0.70383208990097045898, -0.70187830924987792969, -0.70000022649765014648, -0.69819128513336181641, -0.69644522666931152344, -0.69475573301315307617, -0.6931164860725402832, -0.69152402877807617188, -0.68997204303741455078, -0.68844997882843017578, -0.6869557499885559082, -0.68548738956451416016, -0.68404281139373779297, -0.68262004852294921875, -0.68121701478958129883, -0.67983168363571166992, -0.67846208810806274414, -0.67710608243942260742, -0.67576175928115844727, -0.67442697286605834961, -0.6731007695198059082, -0.67178291082382202148, -0.67047196626663208008, -0.66916769742965698242, -0.66786980628967285156, -0.66657811403274536133, -0.66529238224029541016, -0.66401243209838867188, -0.66273790597915649414, -0.66146868467330932617, -0.66020441055297851562, -0.65894502401351928711, -0.65769010782241821289, -0.65643954277038574219, -0.65519309043884277344, -0.65395045280456542969, -0.65271174907684326172, -0.65147686004638671875, -0.65024584531784057617, -0.6490185856819152832, -0.64779508113861083984, -0.64657533168792724609, -0.64535921812057495117, -0.64414680004119873047, -0.64293807744979858398, -0.64173287153244018555, -0.64053130149841308594, -0.63933324813842773438, -0.63813871145248413086, -0.63694769144058227539, -0.63576006889343261719, -0.63457590341567993164, -0.63339519500732421875, -0.63221788406372070312, -0.63104397058486938477, -0.62987345457077026367, -0.62870627641677856445, -0.62754243612289428711, -0.62638193368911743164, -0.62522476911544799805, -0.62407094240188598633, -0.62292039394378662109, -0.62177312374114990234, -0.62062913179397583008, -0.6194884181022644043, -0.618350982666015625, -0.61721670627593994141, -0.6160857081413269043, -0.61495792865753173828, -0.61383336782455444336, -0.61271196603775024414, -0.61159378290176391602, -0.6104786992073059082, -0.60936683416366577148, -0.60825806856155395508, -0.60715246200561523438, -0.60604995489120483398, -0.60495054721832275391]
-oriWesTop.dp=[35.09163665771484375, 0.09845150262117385864, 0.07771182060241699219, 0.06322602182626724243, 0.05258392542600631714, 0.04434462636709213257, 0.03779065608978271484, 0.03234168887138366005, 0.02777131646871566772, 0.02380075491964817047, 0.02031334489583969116, 0.01719370484352111816, 0.01437195111066102982, 0.01176333799958229065, 0.0093563012778758968, 0.007126612588763237, 0.00506296334788203239, 0.00314842863008379936, 0.00138211238663643599, -0.00023599354608450085, -0.00170793617144227028, -0.00303957122378051281, -0.00423705019056797028, -0.00530996127054095268, -0.00626731244847178459, -0.00712097715586423874, -0.00788008980453014374, -0.00855331216007471258, -0.00914930831640958959, -0.00967674423009157181, -0.01014051679521799088, -0.01054914016276597977, -0.01091713178902864456, -0.01124737691134214401, -0.01154276449233293533, -0.01180618163198232651, -0.01204051822423934937, -0.01224866416305303574, -0.01243351120501756668, -0.01259795110672712326, -0.012744879350066185, -0.01287718862295150757, -0.01299777533859014511, -0.01310808863490819931, -0.01320854853838682175, -0.01330147311091423035, -0.0133872469887137413, -0.01346625387668609619, -0.01353887841105461121, -0.01360550615936517715, -0.01366652175784111023, -0.01372231077402830124, -0.01377325784415006638, -0.01381974760442972183, -0.01386216562241315842, -0.01390089839696884155, -0.01393633056432008743, -0.01396884862333536148, -0.01399883721023797989, -0.01402624975889921188, -0.01405124086886644363, -0.01407396048307418823, -0.01409449242055416107, -0.01411292050033807755, -0.01412932761013507843, -0.01414379477500915527, -0.0141564076766371727, -0.01416724827140569687, -0.01417639851570129395, -0.01418394315987825394, -0.01418996416032314301, -0.01419454440474510193, -0.0141977677121758461, -0.01419971603900194168, -0.01420040708035230637, -0.01419973559677600861, -0.0141980387270450592, -0.01419534347951412201, -0.01419167686253786087, -0.01418706681579351425, -0.01418154127895832062, -0.01417512726038694382, -0.01416785269975662231, -0.01415974646806716919, -0.01415083371102809906, -0.01414114329963922501, -0.01413070317357778549, -0.01411953940987586975, -0.01410768181085586548, -0.01409515552222728729, -0.01408198941498994827, -0.01406821049749851227, -0.01405384577810764313, -0.01403892412781715393, -0.01402347162365913391, -0.01400751620531082153, -0.01399108581244945526, -0.01397420745342969894, -0.01395690813660621643, -0.01393921580165624619, -0.01392115745693445206]
-oriEasTop.dp=[-34.855838775634765625, 0.09846682846546173096, 0.07771005481481552124, 0.0632351413369178772, 0.05257231369614601135, 0.0443605668842792511, 0.03776074200868606567, 0.03235340863466262123, 0.02777063846588134766, 0.02380250208079814911, 0.0203143581748008728, 0.01720588840544223785, 0.0143650006502866745, 0.01176417618989944458, 0.00935442559421062123, 0.00712472898885607719, 0.00506104622036218643, 0.00314649194478988647, 0.00138015463016927242, -0.00023798526672180742, -0.00170996342785656452, -0.00304163480177521706, -0.00423914846032857895, -0.00531209120526909828, -0.0062694731168448925, -0.00712316948920488358, -0.00788230821490287781, -0.00855554919689893896, -0.00915155932307243521, -0.00967901013791561127, -0.01014280039817094803, -0.01055143401026725769, -0.01091943681240081787, -0.01124969404190778732, -0.01154509000480175018, -0.01180851273238658905, -0.01204285025596618652, -0.01225099526345729828, -0.01243583764880895615, -0.01260027289390563965, -0.01274719554930925369, -0.01287950202822685242, -0.01300008967518806458, -0.01311040483415126801, -0.01321086101233959198, -0.01330378279089927673, -0.01338955201208591461, -0.01346855517476797104, -0.01354117598384618759, -0.01360779907554388046, -0.01366881001740694046, -0.01372459344565868378, -0.01377553399652242661, -0.01382201723754405975, -0.01386442966759204865, -0.01390315592288970947, -0.01393858250230550766, -0.0139710940420627594, -0.01400107890367507935, -0.01402848586440086365, -0.01405347045511007309, -0.01407618448138237, -0.01409671176224946976, -0.01411513425409793854, -0.01413153484463691711, -0.01414599735289812088, -0.014158603735268116, -0.01416943687945604324, -0.01417858153581619263, -0.01418611966073513031, -0.01419213414192199707, -0.01419670786708593369, -0.01419992465525865555, -0.01420186739414930344, -0.01420255377888679504, -0.01420187577605247498, -0.01420017238706350327, -0.01419747155159711838, -0.01419379934668540955, -0.01418918464332818985, -0.01418365444988012314, -0.01417723670601844788, -0.0141699574887752533, -0.01416184566915035248, -0.01415292732417583466, -0.01414323132485151291, -0.01413278467953205109, -0.01412161532789468765, -0.01410975027829408646, -0.01409721653908491135, -0.0140840429812669754, -0.01407025661319494247, -0.01405588444322347641, -0.01404095534235239029, -0.01402549538761377335, -0.01400953345000743866, -0.01399309653788805008, -0.01397621259093284607, -0.01395890861749649048, -0.01394121348857879639, -0.01392315328121185303]
-oriOutTop.dp=[1325.6787109375, 0.80873179435729980469, 0.79153031110763549805, 0.77926981449127197266, 0.77001374959945678711, 0.76264274120330810547, 0.75653958320617675781, 0.75131201744079589844, 0.74672305583953857422, 0.74258524179458618164, 0.73880147933959960938, 0.73529011011123657227, 0.73198151588439941406, 0.72883445024490356445, 0.72582709789276123047, 0.72294795513153076172, 0.7201887965202331543, 0.71753793954849243164, 0.71499598026275634766, 0.71256387233734130859, 0.71023803949356079102, 0.70801311731338500977, 0.70588529109954833984, 0.7038478851318359375, 0.70189440250396728516, 0.70001661777496337891, 0.69820791482925415039, 0.69646209478378295898, 0.69477277994155883789, 0.69313371181488037109, 0.69154137372970581055, 0.68998950719833374023, 0.68846750259399414062, 0.68697333335876464844, 0.68550497293472290039, 0.68406045436859130859, 0.68263769149780273438, 0.68123465776443481445, 0.67984932661056518555, 0.67847973108291625977, 0.67712372541427612305, 0.6757793426513671875, 0.67444455623626708984, 0.67311829328536987305, 0.67180037498474121094, 0.67048937082290649414, 0.66918504238128662109, 0.66788715124130249023, 0.66659539937973022461, 0.66530960798263549805, 0.66402953863143920898, 0.66275501251220703125, 0.6614856719970703125, 0.66022139787673950195, 0.65896195173263549805, 0.65770697593688964844, 0.65645635128021240234, 0.6552098393440246582, 0.65396714210510253906, 0.6527283787727355957, 0.65149343013763427734, 0.65026235580444335938, 0.64903503656387329102, 0.64781147241592407227, 0.64659160375595092773, 0.64537549018859863281, 0.64416301250457763672, 0.64295417070388793945, 0.64174896478652954102, 0.64054733514785766602, 0.63934922218322753906, 0.63815462589263916016, 0.63696348667144775391, 0.6357758641242980957, 0.63459163904190063477, 0.63341087102890014648, 0.63223350048065185547, 0.63105952739715576172, 0.62988895177841186523, 0.62872171401977539062, 0.62755781412124633789, 0.62639725208282470703, 0.62524002790451049805, 0.62408614158630371094, 0.62293553352355957031, 0.62178820371627807617, 0.62064415216445922852, 0.61950337886810302734, 0.61836588382720947266, 0.61723160743713378906, 0.61610054969787597656, 0.61497271060943603516, 0.61384809017181396484, 0.61272662878036499023, 0.61160838603973388672, 0.61049330234527587891, 0.60938131809234619141, 0.60827249288558959961, 0.60716682672500610352, 0.60606426000595092773, 0.60496479272842407227]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_ReverseBuoyancy3Zones.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_ReverseBuoyancy3Zones.txt
deleted file mode 100644
index 30a1e782..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_ReverseBuoyancy3Zones.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-last-generated=2016-03-15
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "18",
- "linear": " "
-}
-oriWesTop.port_a.m_flow=[0.05965141952037811279, 0.00280287675559520721, 0.0023590712808072567, 0.00196646945551037788, 0.00163163372781127691, 0.00135409238282591105, 0.00112948159221559763, 0.00093973201001062978, 0.00077965011587366462, 0.0006433374946936965, 0.00052591145504266024, 0.00042250112164765596, 0.00033039521076716483, 0.00024801190011203289, 0.00017365343228448172, 0.00010555618064245209, 0.00004255428575561382, -0.00001586410871823318, -0.00006998434400884435, -0.00012008072371827438, -0.00016643133130855858, -0.00020929925085511059, -0.00024893428781069815, -0.00028559123165905476, -0.00031940088956616819, -0.00035042507806792855, -0.00037875768612138927, -0.00040449551306664949, -0.00042777042835950857, -0.00044873895240016282, -0.00046756042866036296, -0.000484419462736696, -0.00049946724902838469, -0.00051285227527841926, -0.00052471488015726209, -0.00053515576291829348, -0.00054441613610833883, -0.00055258459178730845, -0.00055974948918446898, -0.00056599854724481702, -0.00057141931029036641, -0.00057609891518950462, -0.00058012426597997546, -0.00058358209207653999, -0.00058652192819863558, -0.00058901822194457054, -0.00059115624753758311, -0.00059296161634847522, -0.00059446011437103152, -0.00059567729476839304, -0.00059663894353434443, -0.00059737055562436581, -0.00059789780061691999, -0.00059824623167514801, -0.00059844146016985178, -0.00059850903926417232, -0.00059846218209713697, -0.00059830013196915388, -0.00059806852368637919, -0.00059777148999273777, -0.00059741293080151081, -0.00059699692064896226, -0.00059652741765603423, -0.00059600855456665158, -0.00059544423129409552, -0.00059483858058229089, -0.0005941955023445189, -0.00059351912932470441, -0.00059281347785145044, -0.00059208250604569912, -0.00059133028844371438, -0.00059056084137409925, -0.00058977818116545677, -0.00058898638235405087, -0.00058818946126848459, -0.00058737857034429908, -0.00058656273176893592, -0.00058574293507263064, -0.00058491941308602691, -0.00058409239863976836, -0.00058326224097982049, -0.00058242917293682694, -0.00058159342734143138, -0.00058075535343959928, -0.00057991512585431337, -0.00057907309383153915, -0.00057822954840958118, -0.0005773846642114222, -0.0005765387904830277, -0.00057569221826270223, -0.00057484512217342854, -0.00057399779325351119, -0.00057315058074891567, -0.00057230371749028563, -0.00057145743630826473, -0.00057061202824115753, -0.0005697677843272686, -0.00056892499560490251, -0.00056808383669704199, -0.00056724471505731344, -0.00056640780530869961]
-dooOpeClo.mBA_flow=[0.2152271270751953125, 0.28904363512992858887, 0.24597920477390289307, 0.21137540042400360107, 0.18441139161586761475, 0.16328407824039459229, 0.14635111391544342041, 0.13248053193092346191, 0.1208031773567199707, 0.11069927364587783813, 0.10222371667623519897, 0.09526841342449188232, 0.089234180748462677, 0.08432587981224060059, 0.08040700852870941162, 0.07805100083351135254, 0.07788387686014175415, 0.0781264379620552063, 0.07813416421413421631, 0.07814158499240875244, 0.07814872264862060547, 0.0781205594539642334, 0.07787474989891052246, 0.07788570970296859741, 0.07845757901668548584, 0.07954987883567810059, 0.0808803364634513855, 0.08218300342559814453, 0.08348029851913452148, 0.08471089601516723633, 0.08581937104463577271, 0.08682065457105636597, 0.08774538338184356689, 0.0885912775993347168, 0.08935794234275817871, 0.09004460275173187256, 0.09066183120012283325, 0.09121181070804595947, 0.0916978493332862854, 0.09212410449981689453, 0.09249538928270339966, 0.09281694144010543823, 0.09309429675340652466, 0.09333317726850509644, 0.09353683143854141235, 0.09371025115251541138, 0.09385926276445388794, 0.09398563951253890991, 0.09409115463495254517, 0.09417758136987686157, 0.09424667060375213623, 0.09430018067359924316, 0.0943398699164390564, 0.09436747431755065918, 0.09438472241163253784, 0.09439335763454437256, 0.09439426660537719727, 0.09438738226890563965, 0.0943757966160774231, 0.09435977041721343994, 0.09433957934379577637, 0.09431548416614532471, 0.09428776055574417114, 0.09425666928291320801, 0.09422248601913452148, 0.09418547153472900391, 0.09414590150117874146, 0.09410404413938522339, 0.09406016767024993896, 0.09401455521583557129, 0.0939674675464630127, 0.09391918033361434937, 0.0938699766993522644, 0.09382011741399765015, 0.09376989305019378662, 0.09371867775917053223, 0.09366710484027862549, 0.0936152338981628418, 0.09356308728456497192, 0.09351068735122680664, 0.09345804899930953979, 0.09340518712997436523, 0.09335213154554367065, 0.0932988971471786499, 0.09324550628662109375, 0.09319198131561279297, 0.09313832968473434448, 0.09308458119630813599, 0.09303075820207595825, 0.09297687560319900513, 0.09292294830083847046, 0.09286900609731674194, 0.09281506389379501343, 0.09276114404201507568, 0.09270726144313812256, 0.09265343844890594482, 0.09259969741106033325, 0.09254606068134307861, 0.09249253571033477783, 0.0924391523003578186, 0.0923859328031539917]
-oriOutBot.port_a.m_flow=[-0.00780478585511445999, -0.00764073198661208153, -0.00753089413046836853, -0.00745329679921269417, -0.00739553896710276604, -0.0073505723848938942, -0.00731412973254919052, -0.00728373182937502861, -0.00725760078057646751, -0.00723473681136965752, -0.0072143925353884697, -0.00719590438529849052, -0.0071788509376347065, -0.00716302264481782913, -0.00714820623397827148, -0.00713418843224644661, -0.00712080718949437141, -0.00710799731314182281, -0.0070956978015601635, -0.00708386581391096115, -0.00707246875390410423, -0.00706147635355591774, -0.00705086113885045052, -0.00704059377312660217, -0.00703066121786832809, -0.00702105788514018059, -0.00701177492737770081, -0.00700280303135514259, -0.00699412776157259941, -0.00698573281988501549, -0.00697760051116347313, -0.0069697103463113308, -0.00696204463019967079, -0.00695458753034472466, -0.006947321817278862, -0.00694023724645376205, -0.00693330401554703712, -0.00692651281133294106, -0.00691985292360186577, -0.00691331410780549049, -0.00690688611939549446, -0.00690055824816226959, -0.00689432024955749512, -0.00688816141337156296, -0.00688207568600773811, -0.00687605468556284904, -0.00687008723616600037, -0.00686417007818818092, -0.00685830088332295418, -0.00685247639194130898, -0.00684669287875294685, -0.00684094754979014397, -0.00683523714542388916, -0.00682955887168645859, -0.00682390900328755379, -0.00681828474625945091, -0.00681268423795700073, -0.00680710747838020325, -0.00680154887959361076, -0.00679600797593593597, -0.00679048430174589157, -0.00678497692570090294, -0.00677948584780097008, -0.00677401060238480568, -0.00676855025812983513, -0.00676310434937477112, -0.00675767241045832634, -0.00675225397571921349, -0.00674684857949614525, -0.00674145575612783432, -0.00673607457429170609, -0.00673070503398776054, -0.00672534620389342308, -0.00671999761834740639, -0.00671465881168842316, -0.00670933118090033531, -0.00670401286333799362, -0.00669870432466268539, -0.00669340556487441063, -0.00668811611831188202, -0.00668283598497509956, -0.00667756516486406326, -0.00667230319231748581, -0.00666705099865794182, -0.00666180811822414398, -0.00665657408535480499, -0.00665134890004992485, -0.00664613302797079086, -0.00664092646911740303, -0.00663572829216718674, -0.00663053896278142929, -0.00662535848096013069, -0.00662018684670329094, -0.00661502406001091003, -0.00660986965522170067, -0.00660472363233566284, -0.00659958645701408386, -0.00659445766359567642, -0.00658933725208044052, -0.00658422522246837616, -0.00657912157475948334]
-dooOpeClo.mAB_flow=[0.50730460882186889648, 0.29184642434120178223, 0.24833905696868896484, 0.21334114670753479004, 0.18604329228401184082, 0.16464103758335113525, 0.14747993648052215576, 0.13342042267322540283, 0.12158190459012985229, 0.11134323477745056152, 0.10274977236986160278, 0.09569035470485687256, 0.08956324309110641479, 0.08457370847463607788, 0.08058209717273712158, 0.07815654575824737549, 0.07792641967535018921, 0.07811056077480316162, 0.07806416600942611694, 0.0780215039849281311, 0.07798225432634353638, 0.07791122794151306152, 0.07762587070465087891, 0.07760011404752731323, 0.07813817262649536133, 0.07919944822788238525, 0.08050157874822616577, 0.08177850395441055298, 0.08305252343416213989, 0.08426215499639511108, 0.08535180240869522095, 0.08633621782064437866, 0.08724590390920639038, 0.08807844668626785278, 0.08883323520421981812, 0.0895094648003578186, 0.09011737257242202759, 0.09065913408994674683, 0.09113798290491104126, 0.09155802428722381592, 0.09192395955324172974, 0.09224090725183486938, 0.09251428395509719849, 0.09274966269731521606, 0.09295029938220977783, 0.0931212306022644043, 0.09326810389757156372, 0.0933926701545715332, 0.09349668025970458984, 0.09358187764883041382, 0.09365001320838928223, 0.09370280802249908447, 0.09374198317527770996, 0.09376925230026245117, 0.09378631412982940674, 0.09379487484693527222, 0.09379581362009048462, 0.09378909319639205933, 0.09377773106098175049, 0.09376199543476104736, 0.09374216198921203613, 0.09371847659349441528, 0.09369122236967086792, 0.09366064518690109253, 0.09362702816724777222, 0.09359061717987060547, 0.09355169534683227539, 0.09351051598787307739, 0.09346735477447509766, 0.09342247992753982544, 0.09337614476680755615, 0.0933286324143409729, 0.09328020364046096802, 0.09323113411664962769, 0.09318169206380844116, 0.09313129633665084839, 0.09308053553104400635, 0.0930294916033744812, 0.09297817200422286987, 0.09292659163475036621, 0.09287478774785995483, 0.09282276034355163574, 0.09277053922414779663, 0.09271814674139022827, 0.09266559779644012451, 0.0926129072904586792, 0.09256010502576828003, 0.09250719845294952393, 0.09245421737432479858, 0.09240118414163589478, 0.09234810620546340942, 0.0922950059175491333, 0.0922419130802154541, 0.09218884259462356567, 0.09213580191135406494, 0.09208282828330993652, 0.09202992916107177734, 0.0919771343469619751, 0.09192445129156112671, 0.09187190979719161987, 0.09181952476501464844]
-oriOutTop.port_a.m_flow=[0.00780478585511445999, 0.00764023978263139725, 0.00753060635179281235, 0.00745307980105280876, 0.00739543745294213295, 0.00735049881041049957, 0.00731408968567848206, 0.00728370295837521553, 0.00725759845227003098, 0.00723473681136965752, 0.0072144046425819397, 0.00719592347741127014, 0.0071788751520216465, 0.00716305011883378029, 0.0071482374332845211, 0.00713422195985913277, 0.0071208425797522068, 0.00710803456604480743, 0.00709573738276958466, 0.00708390725776553154, 0.00707251159474253654, 0.00706152105703949928, 0.00705090723931789398, 0.00704064127057790756, 0.0070307096466422081, 0.00702110771089792252, 0.00701182615011930466, 0.00700285518541932106, 0.0069941813126206398, 0.00698578730225563049, 0.00697765592485666275, 0.00696976622566580772, 0.00696210190653800964, 0.00695464480668306351, 0.00694738002493977547, 0.00694029591977596283, 0.00693336315453052521, 0.00692657241597771645, 0.00691991299390792847, 0.0069133746437728405, 0.00690694665536284447, 0.0069006187841296196, 0.00689438125118613243, 0.00688822241500020027, 0.00688213715329766273, 0.00687611568719148636, 0.00687014823779463768, 0.00686423154547810555, 0.0068583623506128788, 0.0068525378592312336, 0.00684675434604287148, 0.00684100901708006859, 0.00683529861271381378, 0.0068296198733150959, 0.0068239700049161911, 0.00681834574788808823, 0.00681274477392435074, 0.00680716801434755325, 0.00680160941556096077, 0.00679606851190328598, 0.00679054483771324158, 0.00678503746166825294, 0.00677954638376832008, 0.00677407067269086838, 0.00676860986277461052, 0.00676316395401954651, 0.00675773201510310173, 0.00675231358036398888, 0.00674690818414092064, 0.0067415148951113224, 0.00673613371327519417, 0.00673076417297124863, 0.00672540534287691116, 0.00672005629166960716, 0.00671471748501062393, 0.00670938985422253609, 0.0067040715366601944, 0.00669876299798488617, 0.0066934637725353241, 0.00668817386031150818, 0.00668289372697472572, 0.00667762290686368942, 0.00667236093431711197, 0.00666710874065756798, 0.00666186539456248283, 0.00665663136169314384, 0.0066514061763882637, 0.00664619030430912971, 0.00664098327979445457, 0.00663578510284423828, 0.00663059577345848083, 0.00662541529163718224, 0.00662024319171905518, 0.00661508040502667427, 0.0066099255345761776, 0.00660477997735142708, 0.00659964233636856079, 0.00659451354295015335, 0.00658939266577363014, 0.00658428063616156578, 0.00657917652279138565]
-time=[0., 3600.]
-oriEasTop.port_a.m_flow=[-0.05950168892741203308, 0.00280306767672300339, 0.00235983333550393581, 0.0019636515062302351, 0.00163250614423304796, 0.00135941151529550552, 0.00112861092202365398, 0.00093965308042243112, 0.00077967724064365029, 0.00064310891320928931, 0.00052564230281859636, 0.00042257804307155311, 0.00033049439662136137, 0.00024798323283903301, 0.0001735223049763589, 0.00010551061131991446, 0.00004250771962688304, -0.00001591186810401268, -0.00007003332575550303, -0.00012013082596240565, -0.00016648249584250152, -0.00020935134671162814, -0.00024898722767829895, -0.00028564498643390834, -0.00031945543014444411, -0.0003504804044496268, -0.00037881371099501848, -0.00040455226553604012, -0.0004278278502169997, -0.00044879695633426309, -0.00046761901467107236, -0.00048447854351252317, -0.00049952679546549916, -0.00051291217096149921, -0.00052477518329396844, -0.0005352163570933044, -0.00054447702132165432, -0.0005526457098312676, -0.00055981078185141087, -0.00056605995632708073, -0.00057148077758029103, -0.00057616044068709016, -0.00058018584968522191, -0.00058364373398944736, -0.00058658362831920385, -0.00058907998027279973, -0.00059121794765815139, -0.00059302325826138258, -0.00059452169807627797, -0.00059573887847363949, -0.00059670046903192997, -0.00059743196470662951, -0.00059795915149152279, -0.00059830746613442898, -0.00059850257821381092, -0.00059857009910047054, -0.00059852306731045246, -0.00059836090076714754, -0.00059812923427671194, -0.00059783202596008778, -0.00059747335035353899, -0.00059705722378566861, -0.00059658766258507967, -0.00059606862487271428, -0.00059550418518483639, -0.00059489841805770993, -0.00059425522340461612, -0.00059357867576181889, -0.00059287284966558218, -0.00059214176144450903, -0.00059138936921954155, -0.0005906198057346046, -0.00058983702911064029, -0.00058904511388391256, -0.00058824807638302445, -0.00058743706904351711, -0.00058662105584517121, -0.0005858010845258832, -0.00058497744612395763, -0.00058415031526237726, -0.00058332004118710756, -0.00058248679852113128, -0.0005816509947180748, -0.00058081274619325995, -0.00057997240219265223, -0.00057913025375455618, -0.00057828659191727638, -0.00057744159130379558, -0.00057659554295241833, -0.00057574879610911012, -0.00057490152539685369, -0.00057405408006161451, -0.00057320675114169717, -0.00057235971326008439, -0.00057151325745508075, -0.00057066773297265172, -0.00056982337264344096, -0.00056898040929809213, -0.0005681391921825707, -0.00056729989591985941, -0.00056646292796358466]
-volWes.T=[295.149993896484375, 295.533447265625, 295.775360107421875, 295.934326171875, 296.043304443359375, 296.120819091796875, 296.1776123046875, 296.219970703125, 296.25225830078125, 296.27691650390625, 296.295806884765625, 296.31048583984375, 296.321929931640625, 296.330718994140625, 296.3372802734375, 296.342132568359375, 296.345703125, 296.348052978515625, 296.3492431640625, 296.349334716796875, 296.348419189453125, 296.3465576171875, 296.34381103515625, 296.34027099609375, 296.335968017578125, 296.3309326171875, 296.325164794921875, 296.318695068359375, 296.31158447265625, 296.303863525390625, 296.295562744140625, 296.286712646484375, 296.27740478515625, 296.267669677734375, 296.257537841796875, 296.24700927734375, 296.2362060546875, 296.22509765625, 296.213775634765625, 296.202178955078125, 296.190399169921875, 296.178466796875, 296.166351318359375, 296.15411376953125, 296.141754150390625, 296.129302978515625, 296.116790771484375, 296.104217529296875, 296.091583251953125, 296.07891845703125, 296.066192626953125, 296.053436279296875, 296.040679931640625, 296.027862548828125, 296.01507568359375, 296.00225830078125, 295.989471435546875, 295.976654052734375, 295.9638671875, 295.951080322265625, 295.93829345703125, 295.925567626953125, 295.912811279296875, 295.900115966796875, 295.887420654296875, 295.874725341796875, 295.862091064453125, 295.849456787109375, 295.83685302734375, 295.824249267578125, 295.81170654296875, 295.799163818359375, 295.786651611328125, 295.774169921875, 295.76171875, 295.749298095703125, 295.736907958984375, 295.72454833984375, 295.71221923828125, 295.699920654296875, 295.687652587890625, 295.6754150390625, 295.6632080078125, 295.651031494140625, 295.63885498046875, 295.626739501953125, 295.614654541015625, 295.602569580078125, 295.590545654296875, 295.578521728515625, 295.566558837890625, 295.554595947265625, 295.542694091796875, 295.530792236328125, 295.518951416015625, 295.507110595703125, 295.49530029296875, 295.4835205078125, 295.4718017578125, 295.4600830078125, 295.448394775390625]
-volEas.T=[298.149993896484375, 297.719573974609375, 297.4378662109375, 297.24151611328125, 297.096954345703125, 296.985198974609375, 296.89520263671875, 296.82049560546875, 296.756561279296875, 296.7008056640625, 296.651397705078125, 296.606597900390625, 296.565399169921875, 296.527252197265625, 296.49163818359375, 296.4580078125, 296.425994873046875, 296.3953857421875, 296.3660888671875, 296.337921142578125, 296.31085205078125, 296.2847900390625, 296.259674072265625, 296.23541259765625, 296.21197509765625, 296.189361572265625, 296.167510986328125, 296.146453857421875, 296.1260986328125, 296.1064453125, 296.08740234375, 296.0689697265625, 296.05108642578125, 296.033721923828125, 296.01678466796875, 296.000335693359375, 295.984222412109375, 295.968475341796875, 295.953033447265625, 295.937896728515625, 295.92303466796875, 295.908416748046875, 295.894012451171875, 295.87982177734375, 295.86578369140625, 295.8519287109375, 295.838226318359375, 295.82464599609375, 295.8111572265625, 295.797821044921875, 295.784576416015625, 295.77142333984375, 295.75836181640625, 295.745391845703125, 295.732513427734375, 295.719696044921875, 295.706939697265625, 295.694244384765625, 295.681610107421875, 295.66900634765625, 295.656463623046875, 295.64398193359375, 295.631561279296875, 295.619140625, 295.6068115234375, 295.594512939453125, 295.582244873046875, 295.57000732421875, 295.557830810546875, 295.545684814453125, 295.533599853515625, 295.521514892578125, 295.509490966796875, 295.49749755859375, 295.48553466796875, 295.473602294921875, 295.461700439453125, 295.4498291015625, 295.43798828125, 295.426177978515625, 295.414398193359375, 295.402679443359375, 295.390960693359375, 295.3792724609375, 295.36761474609375, 295.355987548828125, 295.34442138671875, 295.332855224609375, 295.321319580078125, 295.309814453125, 295.29833984375, 295.286895751953125, 295.275482177734375, 295.26409912109375, 295.25274658203125, 295.241424560546875, 295.230133056640625, 295.218841552734375, 295.207611083984375, 295.1964111328125, 295.185211181640625]
-volOut.T=[288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375]
-volTop.T=[293.149993896484375, 293.122833251953125, 293.124237060546875, 293.12530517578125, 293.126190185546875, 293.12689208984375, 293.12744140625, 293.1279296875, 293.1282958984375, 293.12860107421875, 293.12884521484375, 293.129058837890625, 293.12921142578125, 293.12933349609375, 293.12939453125, 293.12945556640625, 293.129486083984375, 293.129486083984375, 293.1295166015625, 293.129547119140625, 293.129608154296875, 293.129669189453125, 293.1297607421875, 293.129852294921875, 293.129974365234375, 293.130096435546875, 293.1302490234375, 293.130401611328125, 293.13055419921875, 293.1307373046875, 293.130889892578125, 293.131072998046875, 293.131256103515625, 293.1314697265625, 293.13165283203125, 293.1318359375, 293.132049560546875, 293.13226318359375, 293.1324462890625, 293.132659912109375, 293.13287353515625, 293.133087158203125, 293.13330078125, 293.133514404296875, 293.13372802734375, 293.1339111328125, 293.134124755859375, 293.13433837890625, 293.134552001953125, 293.134765625, 293.134979248046875, 293.13519287109375, 293.135406494140625, 293.135589599609375, 293.13580322265625, 293.136016845703125, 293.13623046875, 293.13641357421875, 293.136627197265625, 293.1368408203125, 293.13702392578125, 293.137237548828125, 293.137420654296875, 293.13763427734375, 293.1378173828125, 293.138031005859375, 293.138214111328125, 293.138397216796875, 293.13861083984375, 293.1387939453125, 293.13897705078125, 293.13916015625, 293.13934326171875, 293.1395263671875, 293.139739990234375, 293.139923095703125, 293.140106201171875, 293.1402587890625, 293.14044189453125, 293.140625, 293.14080810546875, 293.1409912109375, 293.14117431640625, 293.141326904296875, 293.141510009765625, 293.141693115234375, 293.141845703125, 293.14202880859375, 293.1422119140625, 293.142364501953125, 293.142547607421875, 293.1427001953125, 293.142852783203125, 293.143035888671875, 293.1431884765625, 293.143341064453125, 293.143524169921875, 293.1436767578125, 293.143829345703125, 293.14398193359375, 293.144134521484375]
-dooOpeClo.dpAB[1]=[0.16304393112659454346, 0.09079685807228088379, 0.06983232498168945312, 0.05564460158348083496, 0.0455649644136428833, 0.03807071223855018616, 0.03227645158767700195, 0.02766754664480685841, 0.02388827316462993622, 0.02073389291763305664, 0.01805894821882247925, 0.01573302038013935089, 0.01367472484707832336, 0.0118431365117430687, 0.0101973013952374441, 0.0086963362991809845, 0.00731002259999513626, 0.00602655205875635147, 0.00483865709975361824, 0.00373959844000637531, 0.00272278790362179279, 0.00178215838968753815, 0.000912047631572932, 0.00010675931116566062, -0.00063655024860054255, -0.0013192071346566081, -0.00194321339949965477, -0.00251062307506799871, -0.00302423327229917223, -0.00348738953471183777, -0.00390351074747741222, -0.00427657691761851311, -0.00460983533412218094, -0.00490649370476603508, -0.00516960397362709045, -0.00540132727473974228, -0.0056069791316986084, -0.00578848086297512054, -0.00594775471836328506, -0.00608672387897968292, -0.00620731199160218239, -0.00631144456565380096, -0.00640104711055755615, -0.00647804746404290199, -0.00654353061690926552, -0.00659913476556539536, -0.00664676586166024208, -0.00668699294328689575, -0.00672038458287715912, -0.00674751028418540955, -0.00676894001662731171, -0.00678524374961853027, -0.00679699098691344261, -0.00680475262925028801, -0.00680910004302859306, -0.00681060319766402245, -0.00680955639109015465, -0.00680594006553292274, -0.00680077448487281799, -0.00679414859041571617, -0.00678615272045135498, -0.0067768758162856102, -0.00676640775054693222, -0.00675483793020248413, -0.00674225669354200363, -0.0067287529818713665, -0.00671441759914159775, -0.00669933948665857315, -0.00668360898271203041, -0.00666731549426913261, -0.00665054982528090477, -0.00663340184837579727, -0.00661596097052097321, -0.00659831799566745758, -0.00658056279644370079, -0.00656249420717358589, -0.0065443175844848156, -0.00652605295181274414, -0.00650770682841539383, -0.00648928480222821236, -0.00647079292684793472, -0.00645223772153258324, -0.00643362430855631828, -0.00641495967283844948, -0.00639624940231442451, -0.00637749908491969109, -0.00635871570557355881, -0.00633990438655018806, -0.00632107164710760117, -0.0063022230751812458, -0.00628336519002914429, -0.00626450404524803162, -0.00624564569443464279, -0.00622679572552442551, -0.00620796019211411476, -0.00618914561346173286, -0.00617035804316401482, -0.00615160306915640831, -0.00613288674503564835, -0.00611421559005975723, -0.00609559565782546997]
-oriOutBot.dp=[-0.60073649883270263672, -0.57574743032455444336, -0.55931329727172851562, -0.5478464961051940918, -0.53938853740692138672, -0.53284925222396850586, -0.52757889032363891602, -0.52320265769958496094, -0.51945531368255615234, -0.51618748903274536133, -0.51328855752944946289, -0.51066118478775024414, -0.50824362039566040039, -0.50600481033325195312, -0.50391376018524169922, -0.50193929672241210938, -0.50005811452865600586, -0.49826058745384216309, -0.49653777480125427246, -0.4948832094669342041, -0.49329206347465515137, -0.49175986647605895996, -0.49028244614601135254, -0.48885563015937805176, -0.48747730255126953125, -0.48614650964736938477, -0.48486182093620300293, -0.48362177610397338867, -0.48242431879043579102, -0.48126691579818725586, -0.4801470637321472168, -0.4790617525577545166, -0.47800856828689575195, -0.47698506712913513184, -0.47598895430564880371, -0.47501865029335021973, -0.47407007217407226562, -0.47314181923866271973, -0.47223240137100219727, -0.47134035825729370117, -0.47046425938606262207, -0.4696025848388671875, -0.46875393390655517578, -0.46791681647300720215, -0.46709039807319641113, -0.46627342700958251953, -0.46546447277069091797, -0.46466305851936340332, -0.46386876702308654785, -0.46308118104934692383, -0.46229982376098632812, -0.4615243077278137207, -0.46075412631034851074, -0.4599888920783996582, -0.45922815799713134766, -0.45847144722938537598, -0.45771858096122741699, -0.45696952939033508301, -0.45622354745864868164, -0.45548051595687866211, -0.45474037528038024902, -0.45400309562683105469, -0.45326852798461914062, -0.45253667235374450684, -0.45180737972259521484, -0.45108065009117126465, -0.45035636425018310547, -0.44963446259498596191, -0.4489148557186126709, -0.44819748401641845703, -0.44748225808143615723, -0.44676911830902099609, -0.44605800509452819824, -0.44534879922866821289, -0.44464147090911865234, -0.44393613934516906738, -0.44323265552520751953, -0.44253098964691162109, -0.44183114171028137207, -0.44113308191299438477, -0.44043681025505065918, -0.43974235653877258301, -0.43904963135719299316, -0.43835869431495666504, -0.43766948580741882324, -0.43698203563690185547, -0.43629631400108337402, -0.43561229109764099121, -0.43492999672889709473, -0.43424940109252929688, -0.43357050418853759766, -0.43289327621459960938, -0.43221771717071533203, -0.43154382705688476562, -0.43087157607078552246, -0.43020096421241760254, -0.42953199148178100586, -0.42886462807655334473, -0.42819887399673461914, -0.4275347292423248291, -0.42687216401100158691]
-oriWesTop.dp=[35.09163665771484375, 0.07812304049730300903, 0.05902099236845970154, 0.04610133543610572815, 0.03676452487707138062, 0.02976559288799762726, 0.02444294467568397522, 0.02012285403907298695, 0.01657512784004211426, 0.01360921747982501984, 0.0110865449532866478, 0.00888469163328409195, 0.00693581253290176392, 0.00520022911950945854, 0.00363828241825103543, 0.0022105115931481123, 0.00089094822760671377, -0.00033213000278919935, -0.00146535597741603851, -0.00251488154754042625, -0.00348675763234496117, -0.00438659219071269035, -0.00521962903439998627, -0.00599115760996937752, -0.00670382380485534668, -0.00735878525301814079, -0.00795785337686538696, -0.00850289128720760519, -0.00899650715291500265, -0.00944184232503175735, -0.00984211545437574387, -0.01020110491663217545, -0.01052190084010362625, -0.01080755610018968582, -0.01106096990406513214, -0.01128421071916818619, -0.01148236822336912155, -0.01165728829801082611, -0.01181081496179103851, -0.01194479502737522125, -0.01206107530742883682, -0.01216150075197219849, -0.01224792003631591797, -0.01232217904180288315, -0.01238533109426498413, -0.012438969686627388, -0.01248491834849119186, -0.01252372562885284424, -0.01255594100803136826, -0.01258211303502321243, -0.0126027911901473999, -0.0126185249537229538, -0.01262986380606889725, -0.012637358158826828, -0.01264155656099319458, -0.01264301035553216934, -0.01264200173318386078, -0.01263851672410964966, -0.01263353601098060608, -0.0126271471381187439, -0.01261943578720092773, -0.01261048857122659683, -0.01260039303451776505, -0.01258923579007387161, -0.01257710158824920654, -0.01256407890468835831, -0.01255025342106819153, -0.01253571175038814545, -0.01252054143697023392, -0.01250482816249132156, -0.01248865947127342224, -0.01247212104499340057, -0.01245530135929584503, -0.01243828516453504562, -0.01242116093635559082, -0.01240373775362968445, -0.01238620933145284653, -0.0123685961589217186, -0.01235090475529432297, -0.01233313977718353271, -0.01231530867516994476, -0.01229741610586643219, -0.01227946765720844269, -0.01226147077977657318, -0.01224342919886112213, -0.01222535036504268646, -0.01220723893493413925, -0.01218910142779350281, -0.01217094343155622482, -0.01215277146548032761, -0.01213459018617868423, -0.01211640611290931702, -0.01209822390228509903, -0.01208005193620920181, -0.01206189300864934921, -0.01204375550150871277, -0.01202564314007759094, -0.01200756337493658066, -0.01198952086269855499, -0.01197152212262153625, -0.01195357274264097214]
-oriEasTop.dp=[-34.91568756103515625, 0.07813270390033721924, 0.05904895439743995667, 0.04601747170090675354, 0.03678743541240692139, 0.02989492006599903107, 0.0244227871298789978, 0.02012108452618121754, 0.01657572202384471893, 0.01360427960753440857, 0.01108079217374324799, 0.00888632424175739288, 0.0069379056803882122, 0.00519962608814239502, 0.003635530825704334, 0.00220955675467848778, 0.00088997313287109137, -0.00033312992309220135, -0.00146638171281665564, -0.00251593161374330521, -0.00348783121444284916, -0.00438768696039915085, -0.00522074196487665176, -0.00599228963255882263, -0.0067049744538962841, -0.00735995406284928322, -0.00795903895050287247, -0.00850409362465143377, -0.0089977253228425997, -0.00944307446479797363, -0.00984336156398057938, -0.01020236406475305557, -0.01052317116409540176, -0.01080883480608463287, -0.01106225792318582535, -0.01128550618886947632, -0.01148367114365100861, -0.01165859773755073547, -0.01181212905794382095, -0.01194611284881830215, -0.01206239499151706696, -0.01216282229870557785, -0.01224924251437187195, -0.01232350338250398636, -0.01238665729761123657, -0.01244029588997364044, -0.01248624455183744431, -0.01252505183219909668, -0.01255726628005504608, -0.01258343737572431564, -0.01260411366820335388, -0.01261984556913375854, -0.01263118255883455276, -0.01263867504894733429, -0.01264287158846855164, -0.01264432258903980255, -0.01264331210404634476, -0.01263982430100440979, -0.01263484079390764236, -0.01262844912707805634, -0.01262073591351509094, -0.01261178683489561081, -0.01260168850421905518, -0.01259052753448486328, -0.01257839053869247437, -0.01256536506116390228, -0.01255153678357601166, -0.01253699231892824173, -0.01252181828022003174, -0.01250610221177339554, -0.01248992979526519775, -0.01247338950634002686, -0.01245656609535217285, -0.01243954803794622421, -0.01242242101579904556, -0.01240499317646026611, -0.01238746196031570435, -0.01236984599381685257, -0.01235215179622173309, -0.01233438402414321899, -0.0123165501281619072, -0.01229865476489067078, -0.01228070352226495743, -0.01226270385086536407, -0.01224465947598218918, -0.01222657784819602966, -0.01220846362411975861, -0.0121903223916888237, -0.01217216160148382187, -0.01215398591011762619, -0.01213580183684825897, -0.01211761403828859329, -0.01209942903369665146, -0.01208125334233045578, -0.01206309162080287933, -0.01204495038837194443, -0.01202683523297309875, -0.01200875267386436462, -0.01199070736765861511, -0.01197270583361387253, -0.01195475459098815918]
-oriOutTop.dp=[0.60073649883270263672, 0.57567322254180908203, 0.55927050113677978516, 0.54781454801559448242, 0.53937369585037231445, 0.53283858299255371094, 0.52757304906845092773, 0.52319848537445068359, 0.51945501565933227539, 0.51618754863739013672, 0.51329028606414794922, 0.51066386699676513672, 0.50824701786041259766, 0.50600874423980712891, 0.50391811132431030273, 0.50194406509399414062, 0.50006312131881713867, 0.49826586246490478516, 0.49654331803321838379, 0.49488899111747741699, 0.49329805374145507812, 0.49176606535911560059, 0.49028885364532470703, 0.48886221647262573242, 0.48748403787612915039, 0.48615342378616333008, 0.48486888408660888672, 0.48362901806831359863, 0.48243167996406555176, 0.48127439618110656738, 0.4801546633243560791, 0.47906947135925292969, 0.47801637649536132812, 0.47699296474456787109, 0.47599694132804870605, 0.47502669692039489746, 0.47407817840576171875, 0.47314998507499694824, 0.47224059700965881348, 0.47134858369827270508, 0.47047251462936401367, 0.4696108698844909668, 0.46876221895217895508, 0.46792513132095336914, 0.46709871292114257812, 0.46628174185752868652, 0.46547275781631469727, 0.46467137336730957031, 0.46387708187103271484, 0.46308946609497070312, 0.46230810880661010742, 0.4615325629711151123, 0.46076238155364990234, 0.4599971473217010498, 0.45923638343811035156, 0.45847967267036437988, 0.4577267765998840332, 0.45697769522666931152, 0.45623168349266052246, 0.45548865199089050293, 0.45474848151206970215, 0.45401117205619812012, 0.45327660441398620605, 0.45254468917846679688, 0.45181539654731750488, 0.45108863711357116699, 0.45036432147026062012, 0.44964239001274108887, 0.44892278313636779785, 0.44820538163185119629, 0.44749012589454650879, 0.44677698612213134766, 0.44606581330299377441, 0.44535660743713378906, 0.44464924931526184082, 0.44394388794898986816, 0.44324037432670593262, 0.44253870844841003418, 0.44183883070945739746, 0.44114074110984802246, 0.44044446945190429688, 0.43974995613098144531, 0.43905723094940185547, 0.43836626410484313965, 0.43767702579498291016, 0.43698954582214355469, 0.43630379438400268555, 0.43561977148056030273, 0.43493744730949401855, 0.43425682187080383301, 0.43357789516448974609, 0.43290063738822937012, 0.43222507834434509277, 0.43155115842819213867, 0.43087887763977050781, 0.4302082359790802002, 0.42953923344612121582, 0.42887187004089355469, 0.42820608615875244141, 0.42754191160202026367, 0.42687934637069702148]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_ZonalFlow.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_ZonalFlow.txt
deleted file mode 100644
index 850dac6b..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_ZonalFlow.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-last-generated=2016-12-21
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "6",
- "linear": " "
-}
-rooB.Xi[1]=[0.00999999977648258209, 0.0102437920868396759, 0.01047557871788740158, 0.01069594919681549072, 0.01090547163039445877, 0.01110467221587896347, 0.01129404548555612564, 0.01147411949932575226, 0.01164533570408821106, 0.01180810760706663132, 0.0119628487154841423, 0.01210990920662879944, 0.01224966999143362045, 0.01238268241286277771, 0.01250921562314033508, 0.01262954063713550568, 0.01274392660707235336, 0.01285264361649751663, 0.01295596268028020859, 0.0130541529506444931, 0.01314748451113700867, 0.01323622744530439377, 0.01332042459398508072, 0.01340045128017663956, 0.0134767116978764534, 0.01354934088885784149, 0.01361847203224897385, 0.01368423923850059509, 0.01374677568674087524, 0.01380621641874313354, 0.01386269554495811462, 0.01391634624451398849, 0.01396730262786149979, 0.01401569880545139313, 0.01406166795641183853, 0.01410534512251615524, 0.01414686441421508789, 0.01418635807931423187, 0.01422390807420015335, 0.01425940077751874924, 0.01429327856749296188, 0.01432559266686439514, 0.01435639429837465286, 0.01438573654741048813, 0.01441366970539093018, 0.01444024592638015747, 0.0144655182957649231, 0.01448953710496425629, 0.01451235450804233551, 0.01453402265906333923, 0.01455459278076887131, 0.0145741170272231102, 0.01459264755249023438, 0.01461023464798927307, 0.01462693233042955399, 0.01464278995990753174, 0.01465786062180995941, 0.01467219647020101547, 0.01468584779649972916, 0.01469880249351263046, 0.01471098419278860092, 0.01472263876348733902, 0.01473378017544746399, 0.01474442519247531891, 0.01475458685308694839, 0.01476428098976612091, 0.01477352157235145569, 0.01478232443332672119, 0.01479070447385311127, 0.01479867566376924515, 0.01480625290423631668, 0.01481345202773809433, 0.01482028700411319733, 0.01482677273452281952, 0.01483292505145072937, 0.0148387569934129715, 0.01484428532421588898, 0.01484952401369810104, 0.01485448703169822693, 0.01485919114202260971, 0.01486364938318729401, 0.01486787758767604828, 0.01487189065665006638, 0.01487570349127054214, 0.01487933006137609482, 0.01488278619945049286, 0.01488608680665493011, 0.0148892449215054512, 0.01489225495606660843, 0.01489512156695127487, 0.01489784941077232361, 0.01490044500678777695, 0.01490291394293308258, 0.01490525994449853897, 0.01490749046206474304, 0.01490960922092199326, 0.01491162274032831192, 0.01491353567689657211, 0.01491535361856222153, 0.01491708215326070786, 0.01491872686892747879]
-rooA.Xi[1]=[0.01499999966472387314, 0.01499756239354610443, 0.01499524433165788651, 0.01499304082244634628, 0.01499094534665346146, 0.01498895324766635895, 0.01498705986887216568, 0.01498525869101285934, 0.01498354692012071609, 0.01498191896826028824, 0.01498037111014127731, 0.01497890055179595947, 0.01497750356793403625, 0.01497617363929748535, 0.01497490797191858292, 0.01497370470315217972, 0.01497256103903055191, 0.01497147325426340103, 0.01497044041752815247, 0.01496945880353450775, 0.01496852561831474304, 0.01496763806790113449, 0.0149667961522936821, 0.01496599521487951279, 0.01496523246169090271, 0.01496450696140527725, 0.01496381498873233795, 0.01496315747499465942, 0.01496253255754709244, 0.01496193744242191315, 0.01496137306094169617, 0.01496083661913871765, 0.01496032718569040298, 0.01495984289795160294, 0.0149593837559223175, 0.01495894696563482285, 0.01495853159576654434, 0.01495813671499490738, 0.01495776046067476273, 0.01495740562677383423, 0.01495706755667924881, 0.01495674438774585724, 0.01495643611997365952, 0.01495614275336265564, 0.014955863356590271, 0.01495559792965650558, 0.01495534460991621017, 0.01495510432869195938, 0.01495487615466117859, 0.0149546600878238678, 0.01495445426553487778, 0.01495425868779420853, 0.01495407335460186005, 0.01495389733463525772, 0.01495373062789440155, 0.01495357230305671692, 0.01495342142879962921, 0.01495327800512313843, 0.01495314110070466995, 0.0149530116468667984, 0.01495289057493209839, 0.01495277322828769684, 0.0149526624009013176, 0.01495255529880523682, 0.01495245378464460373, 0.01495235692709684372, 0.01495226472616195679, 0.01495217718183994293, 0.01495209336280822754, 0.01495201326906681061, 0.01495193783193826675, 0.01495186518877744675, 0.01495179720222949982, 0.01495173200964927673, 0.01495167054235935211, 0.01495161280035972595, 0.01495155692100524902, 0.01495150476694107056, 0.01495145540684461594, 0.01495140790939331055, 0.014951363205909729, 0.01495132129639387131, 0.01495128124952316284, 0.01495124306529760361, 0.0149512067437171936, 0.01495117228478193283, 0.01495113875716924667, 0.01495110709220170975, 0.01495107728987932205, 0.01495104841887950897, 0.01495102141052484512, 0.01495099533349275589, 0.01495097111910581589, 0.0149509478360414505, 0.01495092548429965973, 0.01495090406388044357, 0.01495088357478380203, 0.01495086494833230972, 0.01495084632188081741, 0.01495082955807447433, 0.01495081279426813126]
-time=[0., 3600.]
-rooA.T=[303.149993896484375, 303.1451416015625, 303.140533447265625, 303.136138916015625, 303.1319580078125, 303.12799072265625, 303.124237060546875, 303.120635986328125, 303.117218017578125, 303.113983154296875, 303.11090087890625, 303.10797119140625, 303.105194091796875, 303.1025390625, 303.10003662109375, 303.097625732421875, 303.0953369140625, 303.093170166015625, 303.09112548828125, 303.08917236328125, 303.087310791015625, 303.085540771484375, 303.0838623046875, 303.082275390625, 303.08074951171875, 303.079315185546875, 303.07794189453125, 303.076629638671875, 303.07537841796875, 303.074188232421875, 303.07305908203125, 303.071990966796875, 303.07098388671875, 303.07000732421875, 303.069091796875, 303.0682373046875, 303.067413330078125, 303.066619873046875, 303.065887451171875, 303.065155029296875, 303.064483642578125, 303.0638427734375, 303.063232421875, 303.062652587890625, 303.062103271484375, 303.061553955078125, 303.061065673828125, 303.060577392578125, 303.06011962890625, 303.0596923828125, 303.059295654296875, 303.05889892578125, 303.05853271484375, 303.05816650390625, 303.057830810546875, 303.057525634765625, 303.057220458984375, 303.05694580078125, 303.056671142578125, 303.056427001953125, 303.056182861328125, 303.055938720703125, 303.05572509765625, 303.055511474609375, 303.0552978515625, 303.05511474609375, 303.054931640625, 303.05474853515625, 303.054595947265625, 303.054412841796875, 303.05426025390625, 303.05413818359375, 303.053985595703125, 303.053863525390625, 303.053741455078125, 303.053619384765625, 303.05352783203125, 303.05340576171875, 303.053314208984375, 303.05322265625, 303.053131103515625, 303.05303955078125, 303.052978515625, 303.052886962890625, 303.052825927734375, 303.052734375, 303.05267333984375, 303.0526123046875, 303.05255126953125, 303.052490234375, 303.052459716796875, 303.052398681640625, 303.052337646484375, 303.05230712890625, 303.05224609375, 303.052215576171875, 303.05218505859375, 303.0521240234375, 303.052093505859375, 303.05206298828125, 303.052032470703125]
-rooB.T=[293.149993896484375, 293.6395263671875, 294.104766845703125, 294.54693603515625, 294.967193603515625, 295.3665771484375, 295.74615478515625, 296.106964111328125, 296.449951171875, 296.775909423828125, 297.085723876953125, 297.38006591796875, 297.65972900390625, 297.92584228515625, 298.178924560546875, 298.4195556640625, 298.64825439453125, 298.865570068359375, 299.07208251953125, 299.268280029296875, 299.45477294921875, 299.632049560546875, 299.800201416015625, 299.96002197265625, 300.1123046875, 300.25732421875, 300.39532470703125, 300.526611328125, 300.65142822265625, 300.770050048828125, 300.88275146484375, 300.98980712890625, 301.09149169921875, 301.188018798828125, 301.27972412109375, 301.366851806640625, 301.449676513671875, 301.5284423828125, 301.603302001953125, 301.674102783203125, 301.74163818359375, 301.80609130859375, 301.86749267578125, 301.925994873046875, 301.981689453125, 302.03466796875, 302.085052490234375, 302.132904052734375, 302.17840576171875, 302.221588134765625, 302.2625732421875, 302.301513671875, 302.33843994140625, 302.37347412109375, 302.406768798828125, 302.4383544921875, 302.4683837890625, 302.4969482421875, 302.524169921875, 302.54998779296875, 302.574249267578125, 302.59747314453125, 302.619659423828125, 302.640869140625, 302.6611328125, 302.680450439453125, 302.6988525390625, 302.716400146484375, 302.73309326171875, 302.74896240234375, 302.764068603515625, 302.778411865234375, 302.792022705078125, 302.804962158203125, 302.81719970703125, 302.828826904296875, 302.83984375, 302.85028076171875, 302.86016845703125, 302.869537353515625, 302.87841796875, 302.8868408203125, 302.89483642578125, 302.902435302734375, 302.909637451171875, 302.916534423828125, 302.923095703125, 302.929412841796875, 302.935394287109375, 302.94110107421875, 302.946533203125, 302.95172119140625, 302.956634521484375, 302.9613037109375, 302.965728759765625, 302.969970703125, 302.973968505859375, 302.977783203125, 302.981414794921875, 302.98486328125, 302.988128662109375]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Validation_ThreeRoomsContam.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Validation_ThreeRoomsContam.txt
deleted file mode 100644
index cf340857..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Validation_ThreeRoomsContam.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'number of continuous time states': '18', 'linear': ' '}
-oriWesTop.port_a.m_flow=[0.05950168892741203308, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266]
-dooOpeClo.mBA_flow=[0.66745358705520629883, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551, 0.41796234250068664551]
-oriOutBot.port_a.m_flow=[-0.00794025510549545288, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275, -0.0079402560368180275]
-dooOpeClo.mAB_flow=[0.20657479763031005859, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016, 0.41359865665435791016]
-oriOutTop.port_a.m_flow=[0.00794025510549545288, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275, 0.0079402560368180275]
-time=[0., 3600.]
-oriEasTop.port_a.m_flow=[-0.05975272879004478455, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266, -0.00436366209760308266]
-volWes.T=[298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375]
-volEas.T=[293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375]
-volOut.T=[283.149993896484375, 283.149993896484375]
-volTop.T=[293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375]
-dooOpeClo.dpAB[1]=[-0.27359381318092346191, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172, -0.19323909282684326172]
-oriOutBot.dp=[-0.62177175283432006836, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914, -0.62177187204360961914]
-oriWesTop.dp=[34.91568756103515625, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119]
-oriEasTop.dp=[-35.210933685302734375, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119, -0.18778647482395172119]
-oriOutTop.dp=[0.62177175283432006836, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914, 0.62177187204360961914]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SkyTemperature_Examples_BlackBody.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SkyTemperature_Examples_BlackBody.txt
new file mode 100644
index 00000000..9418e7cf
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SkyTemperature_Examples_BlackBody.txt
@@ -0,0 +1,10 @@
+last-generated=2017-02-18
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": " "
+}
+TBlaSkyIrr.TBlaSky=[249.006866455078125, 248.7608642578125, 248.6545867919921875, 248.7099761962890625, 248.948028564453125, 249.4293365478515625, 250.1275634765625, 250.8524322509765625, 251.4170379638671875, 251.731109619140625, 251.988922119140625, 252.1937408447265625, 252.3288421630859375, 252.379974365234375, 252.3680572509765625, 252.337371826171875, 252.332275390625, 252.39727783203125, 252.546112060546875, 252.7234039306640625, 252.865631103515625, 252.911865234375, 252.911865234375, 252.911865234375, 252.911865234375, 252.911865234375, 252.911865234375, 252.911865234375, 252.911865234375, 252.911865234375, 252.7743988037109375, 252.317779541015625, 251.66259765625, 250.9373626708984375, 250.0076904296875, 248.39581298828125, 246.731658935546875, 245.77337646484375, 246.053466796875, 246.5491943359375, 247.04193115234375, 247.5317535400390625, 248.0186767578125, 248.5027618408203125, 248.9840240478515625, 249.4625091552734375, 249.9443206787109375, 250.6764984130859375, 251.686431884765625, 252.8365020751953125, 253.995025634765625, 255.2121429443359375, 256.537811279296875, 257.850494384765625, 259.0357666015625, 260.011505126953125, 260.791046142578125, 261.39410400390625, 261.838348388671875, 262.080078125, 262.031646728515625, 261.8868408203125, 261.85821533203125, 262.1473388671875, 262.73602294921875, 263.40936279296875, 263.95086669921875, 264.174346923828125, 264.258636474609375, 264.281463623046875, 264.23394775390625, 264.10791015625, 263.93927001953125, 263.759368896484375, 263.580047607421875, 263.41339111328125, 263.263519287109375, 263.13055419921875, 263.0206298828125, 262.9398193359375, 263.018463134765625, 263.37176513671875, 263.799407958984375, 264.097991943359375, 264.141448974609375, 264.087066650390625, 263.996124267578125, 263.91583251953125, 263.91015625, 264.06005859375, 264.262298583984375, 264.390594482421875, 264.253997802734375, 263.113861083984375, 261.3216552734375, 259.578277587890625, 258.61865234375, 258.16290283203125, 257.770843505859375, 257.37445068359375, 256.90435791015625]
+TBlaSky.TBlaSky=[249.155670166015625, 248.9548187255859375, 248.8697052001953125, 248.914459228515625, 249.1075439453125, 249.5235443115234375, 250.181732177734375, 250.89892578125, 251.4248199462890625, 251.6193695068359375, 251.8007965087890625, 251.985626220703125, 252.158599853515625, 252.2882843017578125, 252.2978363037109375, 252.2458038330078125, 252.210845947265625, 252.269805908203125, 252.4337615966796875, 252.635528564453125, 252.8040008544921875, 252.8699951171875, 252.871490478515625, 252.8618927001953125, 252.8557586669921875, 252.867645263671875, 252.8946990966796875, 252.9239959716796875, 252.9550018310546875, 252.9871673583984375, 252.8537445068359375, 252.33660888671875, 251.6140289306640625, 250.856689453125, 249.826507568359375, 248.54638671875, 247.4205780029296875, 246.0095977783203125, 246.171905517578125, 246.6681671142578125, 247.2144012451171875, 247.7295379638671875, 248.149383544921875, 248.6208648681640625, 249.156829833984375, 249.70477294921875, 250.2139129638671875, 250.8261871337890625, 251.8548736572265625, 252.9691009521484375, 254.032989501953125, 255.1843109130859375, 256.366302490234375, 257.7374267578125, 259.129730224609375, 260.00738525390625, 260.805755615234375, 261.43548583984375, 261.805328369140625, 261.892303466796875, 261.87542724609375, 261.854156494140625, 261.915435791015625, 262.169891357421875, 262.730133056640625, 263.421661376953125, 263.976470947265625, 264.111236572265625, 264.111236572265625, 264.111236572265625, 264.111236572265625, 264.109375, 264.03118896484375, 263.87469482421875, 263.69036865234375, 263.52874755859375, 263.398681640625, 263.2762451171875, 263.162750244140625, 263.059478759765625, 263.107757568359375, 263.448760986328125, 263.8800048828125, 264.1922607421875, 264.2308349609375, 264.107696533203125, 263.932830810546875, 263.808441162109375, 263.832122802734375, 264.0003662109375, 264.212615966796875, 264.36431884765625, 264.248748779296875, 262.8402099609375, 260.960662841796875, 259.50982666015625, 258.693359375, 258.1749267578125, 257.743682861328125, 257.350860595703125, 256.965423583984375]
+time=[0., 86400.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_AltitudeAngle.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_AltitudeAngle.txt
new file mode 100644
index 00000000..1920d1e6
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_AltitudeAngle.txt
@@ -0,0 +1,4 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1', 'linear': ' '}
+altAng.alt=[-1.24054706096649169922, -1.23372220993041992188, -1.21913957595825195312, -1.197723388671875, -1.17059230804443359375, -1.13885068893432617188, -1.10347127914428710938, -1.06525599956512451172, -1.02484250068664550781, -0.9827302098274230957, -0.93930828571319580078, -0.89488172531127929688, -0.84969180822372436523, -0.80393224954605102539, -0.75776100158691395148, -0.7113094329833984375, -0.66468894481658935547, -0.6179960966110228382, -0.57131648063659667969, -0.52472776174545288086, -0.47830188274383544922, -0.43210697174072265625, -0.38620889186859130859, -0.34067249298095703125, -0.29556256532669067383, -0.25094491243362426758, -0.20688709616661071777, -0.16345916688442230225, -0.12073434889316540797, -0.0787896960973739624, -0.0377066098153591156, 0.00242861104197800159, 0.04152434319257736206, 0.07948327064514160156, 0.11620210856199279792, 0.15157151222228990028, 0.18547610938549041748, 0.217794761061668396, 0.24840113520622253418, 0.27716451883316040039, 0.30395105481147766113, 0.3286253809928894043, 0.35105255246162414551, 0.37110060453414916992, 0.38864335417747497559, 0.40356335043907165527, 0.41575524210929870605, 0.42512899637222290039, 0.43161275982856750488, 0.43515548110008239746, 0.43572878837585449219, 0.43332806229591369629, 0.42797261476516723633, 0.41970491409301757812, 0.40858909487724304199, 0.3947085142135619007, 0.37816303968429548776, 0.35906580090522782767, 0.33754003047943115234, 0.31371581554412841797, 0.28772726655006408691, 0.25970986485481262207, 0.22979827225208282471, 0.19812460243701934814, 0.16481702029705047607, 0.12999877333641052246, 0.09378750622272491455, 0.05629494786262512207, 0.01762673817574944915, -0.02211749181151356075, -0.06284391880035365696, -0.10446418821811676025, -0.14689500629901885986, -0.19005765020847320557, -0.23387742042541503906, -0.27828299999237060547, -0.32320588827133178711, -0.36857956647872924805, -0.41433876752853393555, -0.4604186713695526123, -0.50675368309020996094, -0.55327653884887695312, -0.59991669654846191406, -0.64659845829010009766, -0.69323939085006713867, -0.73974698781967163086, -0.78601545095443725586, -0.83192116022109985352, -0.87731641530990600586, -0.92202150821685791016, -0.96581387519836425781, -1.00841379165649414062, -1.04946553707122802734, -1.08851397037506103516, -1.12497651576995849609, -1.15811586380004882812, -1.18702495098114013672, -1.21064448356628417969, -1.22784900665283203125, -1.23762166500091552734, -1.23929238319396972656]
+time=[0., 86400.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_Declination.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_Declination.txt
new file mode 100644
index 00000000..a6b7606a
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_Declination.txt
@@ -0,0 +1,10 @@
+last-generated=2016-01-06
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+solDecNOAA.y=[-0.40075439214706420898, -0.38843080401420593262, -0.37610718607902526855, -0.36378359794616699219, -0.35146000981330871582, -0.33913639187812805176, -0.32681280374526977539, -0.31448918581008911133, -0.30216559767723083496, -0.28506717085838317871, -0.26332300901412963867, -0.24157883226871490479, -0.21983467042446136475, -0.19809049367904663086, -0.17634633183479309082, -0.15460215508937835693, -0.13285797834396362305, -0.10845525562763214111, -0.08352953940629959106, -0.05860381573438644409, -0.03367809578776359558, -0.00875237584114074707, 0.01617334410548210144, 0.04109906405210494995, 0.06602478772401809692, 0.0900481492280960083, 0.1123389899730682373, 0.13462983071804046631, 0.15692067146301269531, 0.17921151220798492432, 0.20150235295295715332, 0.22379320859909057617, 0.24608404934406280518, 0.26737424731254577637, 0.28154867887496948242, 0.29572311043739318848, 0.30989754199981689453, 0.32407197356224060059, 0.33824640512466430664, 0.3524208366870880127, 0.36659526824951171875, 0.3807696998119354248, 0.3872928321361541748, 0.38932499289512634277, 0.39135715365409851074, 0.39338931441307067871, 0.39542147517204284668, 0.39745363593101501465, 0.39948579668998718262, 0.40151798725128173828, 0.39834102988243103027, 0.38769775629043579102, 0.37705445289611816406, 0.36641114950180053711, 0.35576787590980529785, 0.3451245725154876709, 0.33448126912117004395, 0.32383799552917480469, 0.31319469213485717773, 0.29385957121849060059, 0.27374607324600219727, 0.25363254547119140625, 0.23351906239986419678, 0.21340554952621459961, 0.19329205155372619629, 0.17317855358123779297, 0.15306505560874938965, 0.13114491105079650879, 0.10677707940340042114, 0.08240924030542373657, 0.058041401207447052, 0.03367356210947036743, 0.00930572394281625748, -0.01506211422383785248, -0.03942995145916938782, -0.06352324783802032471, -0.08655496686697006226, -0.10958669334650039673, -0.13261841237545013428, -0.15565013885498046875, -0.17868186533451080322, -0.2017135918140411377, -0.22474531829357147217, -0.24777702987194061279, -0.26543691754341125488, -0.28092738986015319824, -0.2964178621768951416, -0.31190833449363708496, -0.32739883661270141602, -0.34288930892944335938, -0.35837978124618530273, -0.37387025356292724609, -0.38476595282554626465, -0.38680741190910339355, -0.38884887099266052246, -0.39089035987854003906, -0.39293181896209716797, -0.39497327804565429688, -0.39701476693153381348, -0.39905622601509094238, -0.40109771490097045898]
+decAng.decAng=[-0.40288612246513366699, -0.3974062800407409668, -0.39028906822204589844, -0.3815765082836151123, -0.3713188469409942627, -0.35957381129264831543, -0.3464056849479675293, -0.33188414573669433594, -0.31608358025550842285, -0.29908201098442077637, -0.28096026182174682617, -0.26180133223533630371, -0.24168950319290161133, -0.22071008384227752686, -0.19894872605800628662, -0.17649118602275848389, -0.15342301130294799805, -0.12982942163944244385, -0.10579518973827362061, -0.08140458166599273682, -0.05674143508076667786, -0.03188918158411979675, -0.00693095708265900612, 0.01805027015507221222, 0.04297157004475593567, 0.06774991750717163086, 0.09230204671621322632, 0.11654437333345413208, 0.14039286971092224121, 0.16376303136348724365, 0.18656989932060241699, 0.20872808992862701416, 0.23015190660953521729, 0.25075563788414001465, 0.27045372128486633301, 0.28916123509407043457, 0.30679440498352050781, 0.32327112555503845215, 0.33851167559623718262, 0.35243961215019226074, 0.36498248577117919922, 0.37607288360595703125, 0.3856493830680847168, 0.39365741610527038574, 0.40005034208297729492, 0.40479007363319396973, 0.40784803032875061035, 0.40920555591583251953, 0.40885424613952636719, 0.40679633617401123047, 0.4030443727970123291, 0.39762124419212341309, 0.39055946469306945801, 0.38190072774887084961, 0.37169507145881652832, 0.3599999547004699707, 0.34687942266464233398, 0.33240303397178649902, 0.31664502620697021484, 0.2996832430362701416, 0.28159850835800170898, 0.26247370243072509766, 0.24239310622215270996, 0.22144198417663574219, 0.19970598816871643066, 0.1772708594799041748, 0.15422219038009643555, 0.13064518570899963379, 0.10662464797496795654, 0.08224485814571380615, 0.05758966505527496338, 0.03274251148104667664, 0.00778654403984546661, -0.01719526574015617371, -0.04211999103426933289, -0.06690460443496704102, -0.09146586805582046509, -0.11572019010782241821, -0.13958357274532318115, -0.16297151148319244385, -0.18579909205436706543, -0.20798090100288391113, -0.22943128645420074463, -0.25006452202796936035, -0.26979503035545349121, -0.28853785991668701172, -0.30620920658111572266, -0.32272684574127197266, -0.33801102638244628906, -0.35198512673377990723, -0.36457657814025878906, -0.3757177889347076416, -0.38534706830978393555, -0.39340963959693908691, -0.39985853433609008789, -0.4046554267406463623, -0.40777134895324707031, -0.4091872870922088623, -0.40889453887939453125, -0.40689492225646972656, -0.40320065617561340332]
+time=[0., 31536000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_IncidenceAngle.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_IncidenceAngle.txt
new file mode 100644
index 00000000..43094ab8
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_IncidenceAngle.txt
@@ -0,0 +1,4 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1', 'linear': ' '}
+incAng.incAng=[1.90046191215515136719, 1.89835369586944580078, 1.89369571208953857422, 1.88651800155639648438, 1.87686622142791748047, 1.86480009555816650391, 1.85039210319519042969, 1.83372509479522705078, 1.81489098072052001953, 1.79398798942565917969, 1.77111971378326416016, 1.74639225006103515625, 1.71991360187530517578, 1.69179141521453857422, 1.66213285923004150391, 1.63104259967803955078, 1.5986232757568359375, 1.56497406959533691406, 1.53019094467163085938, 1.49436652660369873047, 1.45758998394012451172, 1.41994726657867431641, 1.38152110576629638672, 1.34239184856414794922, 1.30263745784759521484, 1.26233446598052978516, 1.22155821323394775391, 1.1803836822509765625, 1.13888645172119118421, 1.09714341163635253906, 1.05523419380187988281, 1.01324224472045898438, 0.97125661373138427734, 0.9293734431266784668, 0.887698829174041526, 0.84635096788406394275, 0.80546402931213378906, 0.76519197225570678711, 0.72571367025375366211, 0.68723857402801513672, 0.65001410245895385742, 0.61433255672454833984, 0.58053964376449584961, 0.54904061555862426758, 0.52030384540557861328, 0.49485674500465393066, 0.47327023744583129883, 0.45612594485282897949, 0.44396454095840454102, 0.43721988797187805176, 0.43615311384201049805, 0.44080710411071777344, 0.45099857449531555176, 0.46635097265243530273, 0.48635542392730712891, 0.51043862104415915759, 0.53802102804183982165, 0.56855636835098244397, 0.60155338048934936523, 0.63658344745635986328, 0.67327940464019775391, 0.71132999658584594727, 0.75047206878662109375, 0.79048287868499755859, 0.83117300271987915039, 0.87237977981567382812, 0.91396236419677734375, 0.95579701662063598633, 0.99777352809906039166, 1.03979229927062943872, 1.08176207542419389185, 1.12359738349914550781, 1.16521751880645751953, 1.20654475688934326172, 1.24750316143035888672, 1.28801763057708740234, 1.32801294326782226562, 1.36741340160369873047, 1.40614163875579833984, 1.44411814212799072266, 1.48126125335693359375, 1.51748609542846679688, 1.55270481109619140625, 1.58682608604431152344, 1.61975514888763427734, 1.651393890380859375, 1.68164086341857910156, 1.710391998291015625, 1.73754072189331054688, 1.76297926902770996094, 1.78659951686859130859, 1.80829417705535888672, 1.82795834541320800781, 1.84549105167388916016, 1.86079776287078857422, 1.87379133701324462891, 1.88439512252807617188, 1.89254391193389892578, 1.89818644523620605469, 1.90128612518310546875, 1.9018230438232421875]
+time=[0., 86400.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_SolarAzimuth.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_SolarAzimuth.txt
new file mode 100644
index 00000000..356ccc32
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_SolarAzimuth.txt
@@ -0,0 +1,4 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1', 'linear': ' '}
+solAzi.solAzi=[-3.08322381973266601562, -1.91459608078002929688, -1.44320619106292724609, -1.05483102798461914062, -0.58389949798583984375, 0.01988220028579235077, 0.61755478382110595703, 1.08070921897888228003, 1.46834909915924072266, 1.95680916309356689453, -3.08892416954040527344, -1.91830670833587646484, -1.44564175605773925781, -1.05707049369812011719, -0.5862237215042105376, 0.01793643832206726074, 0.61659824848175048828, 1.08047306537628173828, 1.46845638751983642578, 1.95664060115814208984, -3.09454512596130371094, -1.92216181755065917969, -1.44817864894866943359, -1.05938434600830078125, -0.58858990669250488281, 0.01600953936576843262, 0.61571705341339111328, 1.08033752441406383227, 1.46868824958801402758, 1.95665514469146528675, -3.1000766754150390625, -1.92615771293640136719, -1.45081484317779541016, -1.06177115440368652344, -0.59099668264389038086, 0.01410274021327495575, 0.61491221189498901367, 1.08030295372009277344, 1.46904480457305908203, 1.95685136318206787109, -3.10550999641418457031, -1.93029034137725830078, -1.45354866981506347656, -1.06422936916351318359, -0.59344273805618286133, 0.01221728138625621796, 0.61418473720550537109, 1.08036983013153076172, 1.46952569484710693359, 1.95722818374633789062, -3.11083579063415527344, -1.93455588817596435547, -1.45637798309326171875, -1.06675744056701660156, -0.59592676162719349087, 0.0103543987497730465, 0.6135356426239049199, 1.08053863048553178139, 1.4701306819915744839, 1.95778429508209228516, -3.11604619026184082031, -1.93894982337951660156, -1.459300994873046875, -1.06935393810272216797, -0.59844744205474853516, 0.00851533003151416779, 0.61296594142913818359, 1.08080947399139404297, 1.47085940837860107422, 1.95851790904998779297, -3.12113332748413085938, -1.94346797466278076172, -1.46231555938720703125, -1.07201719284057617188, -0.60100328922271728516, 0.00670130690559744835, 0.61247664690017700195, 1.08118283748626708984, 1.47171151638031005859, 1.95942747592926025391, -3.12609004974365234375, -1.94810557365417480469, -1.46541965007781982422, -1.07474565505981445312, -0.6035931706428527832, 0.00491356197744607925, 0.61206859350204467773, 1.08165907859802246094, 1.47268640995025634766, 1.96051120758056640625, -3.13090944290161132812, -1.95285785198211669922, -1.46861088275909423828, -1.07753777503967285156, -0.60621559619903564453, 0.00315332342870533466, 0.61174291372299194336, 1.08223831653594970703, 1.47378373146057128906, 1.9617671966552734375, -3.13558554649353027344]
+time=[0., 864000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_SolarHourAngle.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_SolarHourAngle.txt
new file mode 100644
index 00000000..b10feddb
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_SolarHourAngle.txt
@@ -0,0 +1,4 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1', 'linear': ' '}
+solHouAng.solHouAng=[-3.12102770805358886719, -3.05821537971496582031, -2.995403289794921875, -2.93259096145629882812, -2.86977863311767578125, -2.80696654319763183594, -2.74415421485900878906, -2.68134188652038574219, -2.61852955818176269531, -2.55571722984313964844, -2.49290513992309570312, -2.43009281158447265625, -2.36728048324584960938, -2.3044681549072265625, -2.24165582656860351562, -2.17884349822998046875, -2.11603140830993652344, -2.05321907997131347656, -1.99040675163269042969, -1.92759442329406738281, -1.86478209495544433594, -1.80196988582611083984, -1.73915755748748779297, -1.67634522914886474609, -1.61353290081024169922, -1.55072057247161865234, -1.48790824413299560547, -1.42509603500366210938, -1.36228370666503884046, -1.29947137832641601562, -1.23665904998779296875, -1.17384672164916992188, -1.111034393310546875, -1.04822206497192382812, -0.98540973663330055921, -0.92259740829467795642, -0.8597850799560546875, -0.79697275161743164062, -0.73416042327880859375, -0.67134809494018554688, -0.6085357666015625, -0.54572337865829467773, -0.48291105031967163086, -0.42009872198104858398, -0.35728636384010314941, -0.29447403550148010254, -0.23166167736053466797, -0.1688493192195892334, -0.10603696852922439575, -0.04322461411356925964, 0.01958774402737617493, 0.08240010589361190796, 0.14521247148513793945, 0.20802482962608337402, 0.27083718776702880859, 0.33364957571029718597, 0.39646193385124262054, 0.45927429199218694489, 0.52208667993545532227, 0.58489906787872314453, 0.6477114558219909668, 0.71052384376525878906, 0.77333617210388183594, 0.8361485600471496582, 0.89896094799041748047, 0.96177333593368530273, 1.024585723876953125, 1.08739817142486572266, 1.15021049976348921362, 1.2130229473114009231, 1.27583527565002396997, 1.33864772319793701172, 1.40146017074584960938, 1.46427249908447265625, 1.52708494663238525391, 1.58989739418029785156, 1.65270972251892089844, 1.71552217006683349609, 1.77833461761474609375, 1.84114694595336914062, 1.90395939350128173828, 1.96677184104919433594, 2.02958416938781738281, 2.09239673614501953125, 2.15520906448364257812, 2.21802163124084472656, 2.28083395957946777344, 2.34364628791809082031, 2.40645885467529296875, 2.46927118301391601562, 2.53208374977111816406, 2.59489607810974121094, 2.65770864486694335938, 2.72052097320556640625, 2.78333353996276855469, 2.84614586830139160156, 2.90895843505859375, 2.97177076339721679688, 3.03458333015441894531, 3.09739565849304199219, 3.16020822525024414062]
+time=[0., 86400.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_WallSolarAzimuth.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_WallSolarAzimuth.txt
new file mode 100644
index 00000000..42b2be29
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_WallSolarAzimuth.txt
@@ -0,0 +1,4 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1', 'linear': ' '}
+walSolAzi.verAzi=[3.08322381973266601562, 2.90781903266906738281, 2.74199962615966796875, 2.59041547775268554688, 2.45495104789733886719, 2.33534550666809082031, 2.23011684417724609375, 2.13730907440185546875, 2.05494070053100585938, 1.98121607303619384766, 1.91459608078002929688, 1.85379767417907714844, 1.79776561260223388672, 1.74563515186309814453, 1.69669651985168457031, 1.65036439895629882812, 1.60615253448486328125, 1.56365275382995605469, 1.52251946926116943359, 1.48245632648468017578, 1.44320619106292724609, 1.40454304218292236328, 1.36626601219177246094, 1.32819378376007080078, 1.29016101360321044922, 1.25201451778411865234, 1.21361172199249267578, 1.17481756210327148438, 1.13550376892089821546, 1.09554767608642578125, 1.05483102798461914062, 1.01324045658111572266, 0.97066682577133178711, 0.92700630426406860352, 0.88216090202331520764, 0.83603996038436911853, 0.78856188058853149414, 0.73965638875961303711, 0.68926703929901123047, 0.63735449314117431641, 0.58389949798583984375, 0.52890640497207641602, 0.47240665555000305176, 0.4144611358642578125, 0.35516279935836791992, 0.29463738203048706055, 0.23304313421249389648, 0.17056886851787567139, 0.10742992907762527466, 0.04386276379227638245, 0.01988220028579235077, 0.08354862034320831299, 0.14688280224800109863, 0.20964202284812927246, 0.27160203456878662109, 0.33256331086158802401, 0.39235547184944202792, 0.45084014534950206388, 0.50791186094284057617, 0.5634975433349609375, 0.61755478382110595703, 0.67006921768188476562, 0.7210515141487121582, 0.77053356170654296875, 0.81856578588485717773, 0.86521351337432861328, 0.91055434942245483398, 0.95467579364776611328, 0.99767327308654818463, 1.03964865207672074732, 1.08070921897888139185, 1.12096691131591796875, 1.16053819656372070312, 1.19954419136047363281, 1.23811125755310058594, 1.27637183666229248047, 1.31446588039398193359, 1.35254228115081787109, 1.39076173305511474609, 1.42929959297180175781, 1.46834909915924072266, 1.50812661647796630859, 1.54887688159942626953, 1.59088075160980224609, 1.63446462154388427734, 1.68001151084899902344, 1.72797644138336181641, 1.77890491485595703125, 1.8334560394287109375, 1.89243161678314208984, 1.95680916309356689453, 2.02777814865112304688, 2.10677337646484375, 2.19548702239990234375, 2.29583048820495605469, 2.40978455543518066406, 2.53905034065246582031, 2.68442177772521972656, 2.84490442276000976562, 3.01692056655883789062, 3.08892416954040527344]
+time=[0., 86400.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_ZenithAngle.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_ZenithAngle.txt
new file mode 100644
index 00000000..e334d7cc
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_BaseClasses_Examples_ZenithAngle.txt
@@ -0,0 +1,4 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1', 'linear': ' '}
+zen.zen=[2.24822664260864257812, 2.14016318321228027344, 2.03257274627685546875, 1.92632651329040527344, 1.82223725318908691406, 1.72113323211669921875, 1.62391245365142822266, 1.53158581256866455078, 1.44531106948852539062, 1.36641407012939453125, 1.29638838768005371094, 1.23685932159423828125, 1.18949556350708007812, 1.15586185455322265625, 1.13722264766693115234, 1.13434171676635742188, 1.14734113216400146484, 1.17567837238311767578, 1.21824824810028076172, 1.27357029914855957031, 1.33999311923980712891, 1.41586232185363769531, 1.49962985515594482422, 1.58990728855133056641, 1.68547701835632324219, 1.78527772426605224609, 1.88837409019470214844, 1.99391674995422363281, 2.10109233856201171875, 2.20905804634094238281, 2.31684470176696777344, 2.42319798469543457031, 2.52628970146179199219, 2.62317109107971191406, 2.70874810218811035156, 2.77427124977111816406, 2.80720734596252441406, 2.79783606529235839844, 2.749225616455078125, 2.67368602752685546875, 2.5823974609375, 2.48234915733337402344, 2.37754535675048828125, 2.27035880088806152344, 2.16232228279113769531, 2.05454111099243164062, 1.94791424274444580078, 1.84326159954071044922, 1.74140453338623046875, 1.64322316646575927734, 1.54970216751098632812, 1.46196699142456054688, 1.38130867481231689453, 1.30918920040130615234, 1.24721455574035644531, 1.19705927371978759766, 1.16033041477203369141, 1.13837909698486328125, 1.13209402561187744141, 1.14174199104309082031, 1.16691577434539794922, 1.20661258697509765625, 1.25940966606140136719, 1.32367110252380371094, 1.39772748947143554688, 1.47999858856201171875, 1.56905722618103027344, 1.66364824771881103516, 1.76267778873443603516, 1.86518549919128417969, 1.97030627727508544922, 2.07722234725952148438, 2.18510198593139648438, 2.29300999641418457031, 2.39976644515991210938, 2.50369310379028320312, 2.60213732719421386719, 2.69057226181030273438, 2.76115751266479492188, 2.801990509033203125, 2.80188083648681640625, 2.76086187362670898438, 2.690151214599609375, 2.601634979248046875, 2.50313234329223632812, 2.39915800094604492188, 2.29235744476318359375, 2.18440508842468261719, 2.07647871971130371094, 1.96951162815093994141, 1.86433482170104980469, 1.76176536083221435547, 1.66266787052154541016, 1.56800258159637451172, 1.47886383533477783203, 1.39650762081146240234, 1.32236337661743164062, 1.25801420211791992188, 1.20513415336608886719, 1.16536438465118408203, 1.14013361930847167969]
+time=[100000., 300000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_Examples_IncidenceAngle.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_Examples_IncidenceAngle.txt
new file mode 100644
index 00000000..8fa08bb0
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_Examples_IncidenceAngle.txt
@@ -0,0 +1,8 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1', 'linear': ' '}
+incAngEas.y=[1.55187821388244628906, 1.4941082000732421875, 1.43638455867767333984, 1.37874388694763183594, 1.32122528553009033203, 1.26387095451354980469, 1.20672786235809326172, 1.14984941482543945312, 1.09329688549041748047, 1.03714227676391601562, 0.98147153854370117188, 0.92638826370239257812, 0.87201905250549316406, 0.81852072477340698242, 0.76608949899673450812, 0.71497285366058349609, 0.6654860377311706543, 0.61803197860717762335, 0.57312643527984619141, 0.53142553567886352539, 0.49375084042549133301, 0.46109807491302490234, 0.43460723757743835449, 0.41546386480331420898, 0.40471562743186950684, 0.4030367434024810791, 0.41053885221481323242, 0.42673689126968383789, 0.45069169998168956415, 0.48124253749847412109, 0.51721704006195068359, 0.5575606226921081543, 0.60138797760009765625, 0.64798527956008911133, 0.69678896665573142322, 0.74735808372497536389, 0.7993481755256652832, 0.85248929262161254883, 0.90656799077987670898, 0.96141457557678222656, 1.01689219474792480469, 1.07288968563079833984, 1.12931537628173828125, 1.186092376708984375, 1.24315607547760009766, 1.30045032501220703125, 1.35792624950408935547, 1.41553997993469238281, 1.47325158119201660156, 1.53102362155914306641, 1.58882057666778564453, 1.64660727977752685547, 1.70434832572937011719, 1.76200711727142333984, 1.81954491138458251953, 1.87691962718963667456, 1.93408441543579145971, 1.99098634719848588404, 2.04756426811218261719, 2.1037464141845703125, 2.15944743156433105469, 2.21456408500671386719, 2.26897072792053222656, 2.32251119613647460938, 2.37499022483825683594, 2.42616152763366699219, 2.47571134567260742188, 2.52323842048645019531, 2.5682289600372318894, 2.61002874374389604029, 2.64781808853149369654, 2.68060183525085449219, 2.70723819732666015625, 2.72653698921203613281, 2.7374420166015625, 2.73926806449890136719, 2.73189330101013183594, 2.71579670906066894531, 2.69191646575927734375, 2.66141581535339355469, 2.62547254562377929688, 2.58514571189880371094, 2.54132485389709472656, 2.49472713470458984375, 2.44591808319091796875, 2.39534044265747070312, 2.34333944320678710938, 2.29018640518188476562, 2.23609471321105957031, 2.1812343597412109375, 2.12574291229248046875, 2.06973099708557128906, 2.01329112052917480469, 1.95649933815002441406, 1.89942085742950439453, 1.8421115875244140625, 1.78462040424346923828, 1.72699117660522460938, 1.66926372051239013672, 1.61147534847259521484, 1.55366170406341552734]
+incAngWes.y=[1.58971440792083740234, 1.64748442173004150391, 1.70520818233489990234, 1.76284873485565185547, 1.82036745548248291016, 1.8777217864990234375, 1.93486475944519042969, 1.99174320697784423828, 2.04829573631286621094, 2.10445046424865722656, 2.16012120246887207031, 2.21520447731018066406, 2.26957368850708007812, 2.32307195663452148438, 2.37550306320190429688, 2.42661976814270019531, 2.4761066436767578125, 2.52356076240539550781, 2.5684661865234375, 2.61016702651977539062, 2.64784193038940429688, 2.68049454689025878906, 2.7069854736328125, 2.72612881660461425781, 2.73687696456909179688, 2.738555908203125, 2.73105382919311523438, 2.71485567092895507812, 2.69090104103088378906, 2.66035008430480957031, 2.62437558174133300781, 2.5840320587158203125, 2.54020476341247558594, 2.49360728263854980469, 2.44480371475219726562, 2.39423465728759765625, 2.34224438667297363281, 2.28910326957702636719, 2.23502469062805175781, 2.18017816543579101562, 2.12470030784606933594, 2.06870293617248535156, 2.01227736473083496094, 1.95550024509429931641, 1.89843654632568359375, 1.84114229679107666016, 1.78366649150848388672, 1.72605276107788085938, 1.66834115982055664062, 1.610569000244140625, 1.55277204513549804688, 1.49498546123504638672, 1.437244415283203125, 1.37958550453186035156, 1.32204771041870117188, 1.26467299461364701685, 1.20750820636749223169, 1.15060627460479780737, 1.094028472900390625, 1.03784632682800292969, 0.9821453094482421875, 0.92702847719192504883, 0.87262183427810668945, 0.81908142566680908203, 0.76660239696502685547, 0.71543115377426147461, 0.66588139533996582031, 0.61835432052612304688, 0.57336372137069668842, 0.5315638780593875401, 0.49377456307411221603, 0.46099090576171875, 0.43435445427894592285, 0.4150556027889251709, 0.40415057539939880371, 0.40232449769973754883, 0.40969926118850708008, 0.42579594254493713379, 0.44967630505561828613, 0.48017674684524536133, 0.51612013578414916992, 0.55644690990447998047, 0.60026776790618896484, 0.64686560630798339844, 0.69567465782165527344, 0.74625229835510253906, 0.79825311899185180664, 0.85140627622604370117, 0.90549802780151367188, 0.96035820245742797852, 1.01584982872009277344, 1.07186162471771240234, 1.1283016204833984375, 1.18509340286254882812, 1.24217176437377929688, 1.29948103427886962891, 1.35697221755981445312, 1.41460144519805908203, 1.47232890129089355469, 1.53011727333068847656, 1.58793103694915771484]
+time=[0., 86400.]
+incAngSou.y=[1.89875078201293945312, 1.89664793014526367188, 1.89200150966644287109, 1.88484144210815429688, 1.87521314620971679688, 1.86317610740661621094, 1.84880232810974121094, 1.83217442035675048828, 1.81338357925415039062, 1.79252779483795166016, 1.76971006393432617188, 1.74503624439239501953, 1.71861362457275390625, 1.69054996967315673828, 1.6609516143798828125, 1.62992334365844726562, 1.59756720066070556641, 1.56398248672485351562, 1.52926480770111083984, 1.49350678920745849609, 1.45679736137390136719, 1.41922247409820556641, 1.38086497783660888672, 1.34180510044097900391, 1.30212092399597167969, 1.26188898086547851562, 1.22118461132049560547, 1.18008315563201904297, 1.13866007328033425061, 1.09699273109436035156, 1.05516088008880615234, 1.01324808597564697266, 0.97134363651275634766, 0.92954415082931518555, 0.88795578479766823499, 0.84669727087020896228, 0.80590295791625976562, 0.76572722196578979492, 0.72634905576705932617, 0.68797820806503295898, 0.65086185932159423828, 0.6152922511100769043, 0.58161401748657226562, 0.55023109912872314453, 0.52160936594009399414, 0.49627274274826049805, 0.47478732466697692871, 0.45772880315780639648, 0.44563150405883789062, 0.43892374634742736816, 0.43786296248435974121, 0.44249144196510314941, 0.4526284337043762207, 0.4679025113582611084, 0.48781093955039978027, 0.51178663969039939197, 0.53925532102584861072, 0.56967467069625832288, 0.60255628824234008789, 0.63747328519821166992, 0.67405968904495239258, 0.71200460195541381836, 0.75104504823684692383, 0.79095822572708129883, 0.83155435323715209961, 0.87267065048217773438, 0.91416591405868530273, 0.95591592788696289062, 0.99781036376953158307, 1.03974926471710160669, 1.08164107799529984888, 1.12340021133422851562, 1.1649456024169921875, 1.20619928836822509766, 1.24708533287048339844, 1.28752839565277099609, 1.32745337486267089844, 1.36678409576416015625, 1.40544342994689941406, 1.44335174560546875, 1.48042738437652587891, 1.51658558845520019531, 1.55173850059509277344, 1.58579492568969726562, 1.61866021156311035156, 1.65023648738861083984, 1.68042242527008056641, 1.70911431312561035156, 1.73620593547821044922, 1.76158988475799560547, 1.78515839576721191406, 1.80680453777313232422, 1.82642376422882080078, 1.84391582012176513672, 1.85918629169464111328, 1.87214875221252441406, 1.88272678852081298828, 1.89085566997528076172, 1.89648425579071044922, 1.89957630634307861328, 1.90011191368103027344]
+incAngNor.y=[1.24284183979034423828, 1.24494469165802001953, 1.24959123134613037109, 1.25675129890441894531, 1.26637947559356689453, 1.27841651439666748047, 1.29279029369354248047, 1.30941820144653320312, 1.32820916175842285156, 1.34906482696533203125, 1.37188255786895751953, 1.39655649662017822266, 1.42297899723052978516, 1.45104277133941650391, 1.48064112663269042969, 1.51166939735412597656, 1.544025421142578125, 1.57761025428771972656, 1.61232781410217285156, 1.64808583259582519531, 1.68479526042938232422, 1.722370147705078125, 1.76072776317596435547, 1.79978764057159423828, 1.8394718170166015625, 1.87970376014709472656, 1.92040801048278808594, 1.96150946617126464844, 2.00293254852294921875, 2.04459977149963378906, 2.08643174171447753906, 2.12834453582763671875, 2.17024898529052734375, 2.21204853057861328125, 2.25363683700561523438, 2.29489541053771972656, 2.33568978309631347656, 2.37586545944213867188, 2.41524362564086914062, 2.45361447334289550781, 2.49073076248168945312, 2.5263004302978515625, 2.55997872352600097656, 2.59136152267456054688, 2.61998319625854492188, 2.64531993865966796875, 2.666805267333984375, 2.68386387825012207031, 2.69596123695373535156, 2.70266890525817871094, 2.7037296295166015625, 2.69910120964050292969, 2.68896412849426269531, 2.67369008064270019531, 2.65378165245056152344, 2.62980604171752929688, 2.60233736038207963404, 2.57191801071167036596, 2.53903651237487792969, 2.50411939620971679688, 2.46753287315368652344, 2.42958807945251464844, 2.39054751396179199219, 2.35063457489013671875, 2.31003832817077636719, 2.26892209053039550781, 2.22742676734924316406, 2.18567681312561035156, 2.1437823772430415481, 2.10184335708618208471, 2.05995154380798384253, 2.01819252967834472656, 1.97664701938629150391, 1.93539333343505859375, 1.89450728893280029297, 1.85406422615051269531, 1.81413936614990234375, 1.77480852603912353516, 1.73614919185638427734, 1.69824087619781494141, 1.6611652374267578125, 1.62500703334808349609, 1.58985412120819091797, 1.55579781532287597656, 1.52293241024017333984, 1.49135625362396240234, 1.461170196533203125, 1.43247830867767333984, 1.40538668632507324219, 1.38000273704528808594, 1.35643422603607177734, 1.33478820323944091797, 1.31516885757446289062, 1.29767692089080810547, 1.28240633010864257812, 1.26944386959075927734, 1.25886583328247070312, 1.25073695182800292969, 1.24510836601257324219, 1.24201631546020507812, 1.24148070812225341797]
+incAngHor.y=[2.81305193901062011719, 2.80618309974670410156, 2.79151177406311035156, 2.76997661590576171875, 2.74271082878112792969, 2.71082997322082519531, 2.67531418800354003906, 2.63696885108947753906, 2.5964336395263671875, 2.55420756340026855469, 2.51067972183227539062, 2.46615433692932128906, 2.420871734619140625, 2.3750247955322265625, 2.32877087593078613281, 2.28224062919616699219, 2.23554468154907226562, 2.18877911567687988281, 2.14202928543090820312, 2.09537220001220703125, 2.0488796234130859375, 2.00261950492858886719, 1.95665705204010009766, 1.91105723381042480469, 1.86588442325592041016, 1.82120454311370849609, 1.77708482742309570312, 1.73359513282775878906, 1.69080889225006081311, 1.64880287647247314453, 1.60765850543975830078, 1.56746220588684082031, 1.52830553054809570312, 1.4902858734130859375, 1.45350670814514137952, 1.41807758808136008533, 1.38411402702331542969, 1.35173749923706054688, 1.32107460498809814453, 1.29225659370422363281, 1.26541757583618164062, 1.24069356918334960938, 1.21821987628936767578, 1.19812929630279541016, 1.18054842948913574219, 1.16559541225433349609, 1.15337598323822021484, 1.14398074150085449219, 1.13748204708099365234, 1.13393104076385498047, 1.13335645198822021484, 1.13576281070709228516, 1.14113080501556396484, 1.14941751956939697266, 1.16055858135223388672, 1.17447018623352072986, 1.19105195999145530017, 1.2101901769638059303, 1.23176109790802001953, 1.25563383102416992188, 1.28167390823364257812, 1.30974531173706054688, 1.33971273899078369141, 1.37144386768341064453, 1.40481007099151611328, 1.43968784809112548828, 1.47595930099487304688, 1.51351249217987060547, 1.55224156379699729236, 1.59204697608947709497, 1.63283455371856645044, 1.67451620101928710938, 1.7170085906982421875, 1.7602329254150390625, 1.80411458015441894531, 1.84858226776123046875, 1.89356791973114013672, 1.93900477886199951172, 1.98482799530029296875, 2.03097295761108398438, 2.07737421989440917969, 2.12396478652954101562, 2.17067456245422363281, 2.21742796897888183594, 2.26414346694946289062, 2.31072854995727539062, 2.35707831382751464844, 2.40306949615478515625, 2.44855546951293945312, 2.49335718154907226562, 2.53725266456604003906, 2.57996344566345214844, 2.62113404273986816406, 2.66030931472778320312, 2.69690608978271484375, 2.73018407821655273438, 2.75923013687133789062, 2.78297567367553710938, 2.800281524658203125, 2.81011605262756347656, 2.81179761886596679688]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_Examples_ZenithAngle.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_Examples_ZenithAngle.txt
new file mode 100644
index 00000000..8cccedc8
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarGeometry_Examples_ZenithAngle.txt
@@ -0,0 +1,4 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1', 'linear': ' '}
+zen.y=[2.16456365585327148438, 2.03073477745056152344, 1.89712202548980712891, 1.76410377025604248047, 1.63206088542938232422, 1.50142896175384521484, 1.37275087833404541016, 1.24674534797668457031, 1.12440633773803710938, 1.00715208053588867188, 0.89704811573028564453, 0.79712319374084472656, 0.71172797679901123047, 0.64668452739715576172, 0.60858184099197387695, 0.60256808996200561523, 0.62956613302230834961, 0.68567955493927001953, 0.76450675725936889648, 0.85979813337326049805, 0.96666508913040161133, 1.08164334297180175781, 1.20236217975616455078, 1.32720148563385009766, 1.45503580570220947266, 1.58506131172180175781, 1.71668183803558349609, 1.84943079948425292969, 1.98291456699371337891, 2.1167621612548828125, 2.250568389892578125, 2.38380551338195800781, 2.51564621925354003906, 2.64454174041748046875, 2.76701235771179199219, 2.87367463111877441406, 2.9376220703125, 2.91834139823913574219, 2.83098506927490234375, 2.71565365791320800781, 2.58976387977600097656, 2.45932102203369140625, 2.32672953605651855469, 2.19314646720886230469, 2.05923867225646972656, 1.92546665668487548828, 1.7922115325927734375, 1.65984690189361572266, 1.52879011631011962891, 1.39955377578735351562, 1.27280962467193603516, 1.14947986602783203125, 1.03087365627288818359, 0.9188931584358215332, 0.81633079051971435547, 0.72723448276519775391, 0.65714663267135620117, 0.61265677213668823242, 0.59950923919677734375, 0.61970764398574829102, 0.67023807764053344727, 0.74493825435638427734, 0.83734136819839477539, 0.94222342967987060547, 1.05583536624908447266, 1.17560517787933349609, 1.29977977275848388672, 1.42714774608612060547, 1.55685067176818847656, 1.68825793266296386719, 1.82088303565979003906, 1.95432353019714355469, 2.08821082115173339844, 2.22215628623962402344, 2.35567426681518554688, 2.48803400993347167969, 2.61791586875915527344, 2.74246811866760253906, 2.85424947738647460938, 2.93138790130615234375, 2.93127226829528808594, 2.85399317741394042969, 2.74215435981750488281, 2.61757135391235351562, 2.4876651763916015625, 2.35528135299682617188, 2.221736907958984375, 2.08776116371154785156, 1.95383882522583007812, 1.82035756111145019531, 1.68768477439880371094, 1.55622172355651855469, 1.42645359039306640625, 1.29900920391082763672, 1.17474496364593505859, 1.05487012863159179688, 0.94113588333129882812, 0.83611476421356201172, 0.7435614466667175293, 0.66871696710586547852, 0.61808133125305175781]
+time=[100000., 300000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_BaseClasses_Examples_BrighteningCoefficient.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_BaseClasses_Examples_BrighteningCoefficient.txt
new file mode 100644
index 00000000..1592c6d4
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_BaseClasses_Examples_BrighteningCoefficient.txt
@@ -0,0 +1,10 @@
+last-generated=2016-09-23
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": " "
+}
+briCoe.F1=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+time=[0., 8640000.]
+briCoe.F2=[-0.12332462519407272339, -0.12328822910785675049, -0.12324903905391693115, -0.12320710718631744385, -0.12316247075796127319, -0.12311516702175140381, -0.12306523323059082031, -0.12301271408796310425, -0.12295766174793243408, -0.12290011346340179443, -0.12284010648727416992, -0.12277768552303314209, -0.12271289527416229248, -0.12264578044414520264, -0.1225763857364654541, -0.12250474840402603149, -0.12243090569972991943, -0.12235490977764129639, -0.12227679789066314697, -0.12219659984111785889, -0.12211437523365020752, -0.12203014642000198364, -0.1219439581036567688, -0.12185584753751754761, -0.12176585197448730469, -0.12167400121688842773, -0.12158034741878509521, -0.1214849129319190979, -0.12138774245977401733, -0.12128885835409164429, -0.12118829786777496338, -0.12108609825372695923, -0.12098228931427001953, -0.12087690830230712891, -0.12076997756958007812, -0.12066153436899185181, -0.12055160105228424072, -0.12044022232294082642, -0.12032742053270339966, -0.12021322548389434814, -0.12009765952825546265, -0.11998075991868972778, -0.11986255645751953125, -0.11974307149648666382, -0.11962233483791351318, -0.11950037628412246704, -0.11937722563743591309, -0.11925290524959564209, -0.11912743747234344482, -0.11900086700916290283, -0.11887320131063461304, -0.11874448508024215698, -0.11861474066972732544, -0.11848398298025131226, -0.11835225671529769897, -0.11821957677602767944, -0.11808598041534423828, -0.11795148998498916626, -0.11781612783670425415, -0.11767993122339248657, -0.11754292994737625122, -0.11740514636039733887, -0.11726660281419754028, -0.11712734401226043701, -0.1169873848557472229, -0.11684676259756088257, -0.11670549958944320679, -0.11656363308429718018, -0.11642119288444519043, -0.11627820879220962524, -0.11613471060991287231, -0.11599072068929672241, -0.115846291184425354, -0.11570142954587936401, -0.11555618792772293091, -0.11541059613227844238, -0.11526467651128768921, -0.11511846631765365601, -0.11497200280427932739, -0.11482532322406768799, -0.11467845737934112549, -0.11453143507242202759, -0.11438430100679397583, -0.11423708498477935791, -0.11408982425928115845, -0.11394256353378295898, -0.11379532516002655029, -0.11364815384149551392, -0.11350108683109283447, -0.11335416138172149658, -0.11320741474628448486, -0.11306089162826538086, -0.11291461437940597534, -0.1127686426043510437, -0.11262299865484237671, -0.11247772723436355591, -0.11233287304639816284, -0.11218847334384918213, -0.11204456537961959839, -0.11190119385719299316, -0.11175839602947235107]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_BaseClasses_Examples_DiffuseIsotropic.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_BaseClasses_Examples_DiffuseIsotropic.txt
new file mode 100644
index 00000000..422600af
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_BaseClasses_Examples_DiffuseIsotropic.txt
@@ -0,0 +1,5 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1', 'linear': ' '}
+HDifTilIso.HGroDifTil=[0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875, 0.00000999999974737875]
+HDifTilIso.HSkyDifTil=[0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376, 0.00004999999873689376]
+time=[0., 8640000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_BaseClasses_Examples_RelativeAirMass.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_BaseClasses_Examples_RelativeAirMass.txt
new file mode 100644
index 00000000..5c785c40
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_BaseClasses_Examples_RelativeAirMass.txt
@@ -0,0 +1,4 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1', 'linear': ' '}
+relAirMas.relAirMas=[36.687042236328125, 36.687042236328125, 36.687042236328125, 10.55069732666015625, 1.86432063579559326172, 1.36908829212188720703, 1.67824554443359375, 5.35386514663698775962, 36.687042236328125, 36.687042236328125, 36.687042236328125, 36.687042236328125, 36.687042236328125, 10.660846710205078125, 1.86513710021972500819, 1.36749410629272460938, 1.67325425148010253906, 5.29326295852661132812, 36.687042236328125, 36.687042236328125, 36.687042236328125, 36.687042236328125, 36.687042236328125, 10.7661876678466796875, 1.86567199230194091797, 1.36575293540954589844, 1.66811323165893554688, 5.23295879364023086566, 36.687042236328125, 36.687042236328125, 36.687042236328125, 36.687042236328125, 36.687042236328125, 10.8662815093994140625, 1.86592423915863037109, 1.36386704444885253906, 1.66282951831817626953, 5.17302036285400390625, 36.687042236328125, 36.687042236328125, 36.687042236328125, 36.687042236328125, 36.687042236328125, 10.960697174072265625, 1.86589288711547851562, 1.36183917522430419922, 1.65740978717803955078, 5.11351060867309570312, 36.687042236328125, 36.687042236328125, 36.687042236328125, 36.687042236328125, 36.687042236328125, 11.04901123046875, 1.86557769775389958866, 1.35967206954956054688, 1.65186131000519442757, 5.05448722839349873226, 36.687042236328125, 36.687042236328125, 36.687042236328125, 36.687042236328125, 36.687042236328125, 11.1308116912841796875, 1.86497867107391357422, 1.35736870765686035156, 1.64619100093841552734, 4.99600362777709960938, 36.687042236328125, 36.687042236328125, 36.687042236328125, 36.687042236328125, 36.687042236328125, 11.2057018280029296875, 1.86409628391265869141, 1.35493206977844238281, 1.64040589332580566406, 4.93810987472534179688, 36.687042236328125, 36.687042236328125, 36.687042236328125, 36.687042236328125, 36.687042236328125, 11.273303985595703125, 1.86293172836303710938, 1.35236561298370361328, 1.63451337814331054688, 4.88085079193115234375, 36.687042236328125, 36.687042236328125, 36.687042236328125, 36.687042236328125, 36.687042236328125, 11.33326435089111328125, 1.86148607730865478516, 1.34967255592346191406, 1.62852025032043457031, 4.82426786422729492188, 36.687042236328125, 36.687042236328125, 36.687042236328125]
+time=[0., 864000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_BaseClasses_Examples_SkyBrightness.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_BaseClasses_Examples_SkyBrightness.txt
new file mode 100644
index 00000000..3da5b206
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_BaseClasses_Examples_SkyBrightness.txt
@@ -0,0 +1,4 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1', 'linear': ' '}
+skyBri.skyBri=[0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423, 0.00000268376311396423]
+time=[0., 8640000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_BaseClasses_Examples_SkyClearness.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_BaseClasses_Examples_SkyClearness.txt
new file mode 100644
index 00000000..d862ede7
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_BaseClasses_Examples_SkyClearness.txt
@@ -0,0 +1,9 @@
+last-generated=2016-09-23
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": " "
+}
+skyCle.skyCle=[1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 4.75662994384765625, 1.00999999046325683594, 1.00999999046325683594, 1.15016782283782958984, 1.00999999046325683594, 1.00999999046325683594, 5.58934926986694335938, 1.00999999046325683594, 1.00999999046325683594, 3.26789379119873046875, 1.00999999046325683594, 1.00999999046325683594, 1.49232983589172363281, 1.00999999046325683594, 1.00999999046325683594, 3.40139460563659667969, 1.00999999046325683594, 1.00999999046325683594, 2.23034477233887384884, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.15015101432800292969, 1.00999999046325683594, 1.00999999046325683594, 4.1006679534912109375, 1.00999999046325683594, 1.00999999046325683594, 1.77885675430297851562, 1.00999999046325683594, 1.00999999046325683594, 1.36817574501037597656, 1.00999999046325683594, 1.00999999046325683594, 1.13719546794891357422, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 2.74600148200982285829, 1.00999999046325683594, 1.00999999046325683594, 1.05341708660125732422, 1.00999999046325683594, 1.00999999046325683594, 2.21888232231140136719, 1.00999999046325683594, 1.00999999046325683594, 1.56545436382293701172, 1.00999999046325683594, 1.02566874027252197266, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.55841624736785888672, 1.00999999046325683594, 1.00999999046325683594, 1.10164964199066162109, 1.00999999046325683594, 1.8610248565673828125, 1.94205701351165771484, 1.00999999046325683594, 1.01512897014617919922, 1.00999999046325683594, 1.00999999046325683594, 1.0258541107177734375, 1.26207506656646728516, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.19488739967346191406, 1.00999999046325683594, 1.00999999046325683594, 1.03770351409912109375, 1.00999999046325683594, 1.00999999046325683594, 1.00999999046325683594, 1.07614302635192871094, 1.00999999046325683594, 1.01026940345764160156, 1.02130401134490966797]
+time=[100000., 3000000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_Examples_DiffuseIsotropic.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_Examples_DiffuseIsotropic.txt
new file mode 100644
index 00000000..ad5bd5ee
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_Examples_DiffuseIsotropic.txt
@@ -0,0 +1,6 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1', 'linear': ' '}
+HDifWal.H=[0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.06541426479816436768, 1.46598899364471435547, 4.20105314254760742188, 7.62023496627807617188, 11.07686710357666015625, 14.7425136566162109375, 19.3250713348388671875, 25.2323970794677734375, 32.872344970703125, 43.83785247802734375, 58.2590789794921875, 73.448333740234375, 86.70452880859375, 96.77602386474609375, 106.10747528076171875, 115.26599884033203125, 124.69039154052734375, 134.9120025634765625, 146.2448577880859375, 157.9451141357421875, 169.1850738525390625, 178.69024658203125, 183.1686553955078125, 184.75250244140625, 186.6802978515625, 192.2317657470703125, 203.66119384765625, 217.9954833984375, 231.209381103515625, 239.3011627197265625, 242.9188690185546875, 244.2351837158203125, 243.1160888671875, 239.4275665283203125, 233.7132720947265625, 227.252471923828125, 220.7056121826171875, 214.7284393310546875, 211.2230072021484375, 211.8426055908203125, 213.408782958984375, 212.562896728515625, 207.34130859375, 201.6994476318359375, 195.8285980224609375, 189.2928924560546875, 181.47601318359375, 170.782257080078125, 157.505615234375, 142.3587493896484375, 125.8919219970703125, 105.8908538818359375, 83.85626983642578125, 62.983562469482421875, 46.4518585205078125, 34.117282867431640625, 24.386768341064453125, 17.173709869384765625, 12.39150524139404296875, 9.0166492462158203125, 5.9365863800048828125, 3.48013448715209960938, 1.98434543609619140625, 1.35951948165893554688, 0.77968955039978027344, 0.30213215947151184082, 0.02909454517066478729, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251, 0.00005999999848427251]
+HDifRoo.H=[0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.10902377963066101074, 2.44331502914428710938, 7.00175523757934570312, 12.7003917694091796875, 18.4615802764892578125, 24.5882244110107421875, 32.25185394287109375, 42.10343170166015625, 54.793910980224609375, 73.02068328857421875, 97.06421661376953125, 122.407867431640625, 144.5120849609375, 161.228485107421875, 176.596527099609375, 191.642852783203125, 207.184173583984375, 224.207550048828125, 243.291473388671875, 263.05706787109375, 281.970550537109375, 297.784820556640625, 305.18072509765625, 307.771484375, 310.9620361328125, 320.2115478515625, 339.0455322265625, 362.666748046875, 384.684295654296875, 398.74298095703125, 405.5399169921875, 408.11767578125, 406.033203125, 398.843475341796875, 387.73284912109375, 375.4246826171875, 363.012664794921875, 351.578826904296875, 341.61212158203125, 332.168701171875, 323.147705078125, 314.50244140625, 307.45343017578125, 305.7144775390625, 305.761444091796875, 303.300811767578125, 294.184173583984375, 277.519805908203125, 255.387542724609375, 229.948760986328125, 203.0690155029296875, 171.1112060546875, 136.046661376953125, 102.76525115966796875, 76.13271331787109375, 56.052822113037109375, 40.1754608154296875, 28.364444732666015625, 20.4836025238037109375, 14.89445400238037109375, 9.814441680908203125, 5.77138614654541015625, 3.30630922317504882812, 2.26476550102233886719, 1.29819822311401367188, 0.50286000967025756836, 0.04840908944606781006, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752]
+HDifFlo.H=[0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0218047555536031723, 0.48866301774978637695, 1.40035104751586914062, 2.54007840156555175781, 3.69215297698974609375, 4.89680147171020507812, 6.39828777313232421875, 8.361362457275390625, 10.950778961181640625, 14.65502071380615234375, 19.453945159912109375, 24.488800048828125, 28.8969669342041015625, 32.32355499267578125, 35.618412017822265625, 38.889148712158203125, 42.19660186767578125, 45.616455078125, 49.1982421875, 52.833171844482421875, 56.39959716796875, 59.595676422119140625, 61.15659332275390625, 61.733531951904296875, 62.398540496826171875, 64.25196075439453125, 68.2768402099609375, 73.32421875, 77.73445892333984375, 79.85933685302734375, 80.29781341552734375, 80.35269927978515625, 80.198974609375, 80.0116424560546875, 79.6936798095703125, 79.08026123046875, 78.3985595703125, 77.8780517578125, 80.8339080810546875, 91.51648712158203125, 103.66985321044921875, 110.62335205078125, 107.22917938232421875, 97.684417724609375, 85.8957672119140625, 75.28497314453125, 68.7678680419921875, 64.04471588134765625, 59.623687744140625, 54.76873779296875, 48.714839935302734375, 40.670490264892578125, 31.6658725738525390625, 23.2018756866455078125, 16.7710094451904296875, 12.1817455291748046875, 8.59807586669921875, 5.98297357559204101562, 4.29940891265869140625, 3.13884472846984863281, 2.05873084068298339844, 1.18888247013092041016, 0.66238158941268920898, 0.45427343249320983887, 0.26118096709251403809, 0.10140431672334671021, 0.00977999996393918991, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575]
+time=[18230400., 18316800.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_Examples_DiffusePerez.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_Examples_DiffusePerez.txt
new file mode 100644
index 00000000..0f7ea6ec
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_Examples_DiffusePerez.txt
@@ -0,0 +1,11 @@
+last-generated=2016-09-23
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": " "
+}
+HDifWal.H=[0.00004927635745843872, 0.00004927163536194712, 0.00004927479312755167, 0.00004928580165142193, 0.00004930453724227846, 0.00004933079981128685, 0.00004936432014801539, 0.00004940477083437145, 0.00004945178079651669, 0.00004950495713273995, 0.00004956388147547841, 0.00004962813545716926, 0.00004969730798620731, 0.00004977099888492376, 0.00004984881888958625, 0.00004993041147827171, 0.00005001543104299344, 0.00005010356471757405, 0.00005019452146370895, 0.0548488907516002655, 1.24259078502655029297, 3.62537813186645507812, 6.1387786865234375, 9.39398956298828125, 12.7577610015869140625, 16.773967742919921875, 21.927364349365234375, 28.4593029022216796875, 37.5988616943359375, 49.342254638671875, 61.520404815673828125, 72.14450836181640625, 80.37271881103515625, 88.03841400146484375, 95.5447845458984375, 103.19678497314453125, 111.359619140625, 120.23700714111328125, 129.2937469482421875, 137.95416259765625, 145.33941650390625, 149.1007537841796875, 150.7299957275390625, 152.5284423828125, 156.8626708984375, 165.3565216064453125, 175.7214813232421875, 187.87811279296875, 196.767486572265625, 202.483367919921875, 206.496978759765625, 208.5415802001953125, 208.32586669921875, 206.0925445556640625, 202.8089599609375, 208.0628662109375, 206.1946563720703125, 206.31005859375, 224.8837127685546875, 245.3067779541015625, 249.4061279296875, 248.7341766357421875, 229.684600830078125, 227.76629638671875, 205.614898681640625, 200.4626922607421875, 191.1058807373046875, 177.8403167724609375, 161.601654052734375, 143.262176513671875, 119.70606231689453125, 87.672576904296875, 59.146942138671875, 41.859149932861328125, 29.706417083740234375, 21.16530609130859375, 14.83728885650634765625, 10.67312145233154296875, 7.75449037551879882812, 5.1005687713623046875, 2.99502086639404296875, 1.69122982025146484375, 1.15194487571716308594, 0.65702414512634277344, 0.25336971879005432129, 0.02431334368884563446, 0.00005002507168683223, 0.00004993920447304845, 0.00004985669511370361, 0.00004977788921678439, 0.00004970313966623507, 0.00004963283208780922, 0.0000495673666591756, 0.00004950715810991824, 0.00004945262480759993, 0.00004940419239574112, 0.00004936226105201058, 0.00004932721640216187, 0.00004929939677822404, 0.00004927908958052285, 0.00004926650581182912]
+HDifRoo.H=[0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.10902377963066101074, 2.44331502914428710938, 6.99351263046264648438, 11.49546527862548828125, 18.195156097412109375, 24.58629608154296875, 32.2524261474609375, 42.103427886962890625, 54.789890289306640625, 73.0095062255859375, 97.04528045654296875, 122.38564300537109375, 144.49322509765625, 161.217559814453125, 176.594635009765625, 191.6505889892578125, 207.2023162841796875, 224.2374725341796875, 243.3353271484375, 263.11688232421875, 282.047454833984375, 297.877960205078125, 305.2840576171875, 307.880859375, 311.07763671875, 320.338775634765625, 339.194122314453125, 362.84332275390625, 384.88897705078125, 398.967315673828125, 405.774871826171875, 408.357269287109375, 406.270660400390625, 399.071502685546875, 387.946075439453125, 375.62152099609375, 363.364837646484375, 351.90338134765625, 341.91107177734375, 332.5667724609375, 323.632415771484375, 314.940765380859375, 307.84710693359375, 305.984039306640625, 306.005035400390625, 303.455596923828125, 294.311798095703125, 277.614013671875, 255.4469146728515625, 229.9759368896484375, 203.0692291259765625, 171.0922393798828125, 136.0260162353515625, 102.7552947998046875, 76.12857818603515625, 56.053104400634765625, 40.1754608154296875, 28.364444732666015625, 20.4836025238037109375, 14.89445400238037109375, 9.814441680908203125, 5.77138614654541015625, 3.30630922317504882812, 2.26476550102233886719, 1.29819822311401367188, 0.50286000967025756836, 0.04840908944606781006, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752]
+HDifFlo.H=[0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0218047555536031723, 0.48866301774978637695, 1.40504336357116699219, 2.58249449729919433594, 3.69215297698974609375, 4.89680147171020507812, 6.39828777313232421875, 8.361362457275390625, 10.950778961181640625, 14.65502071380615234375, 19.453945159912109375, 24.488800048828125, 28.8969669342041015625, 32.32355499267578125, 35.618412017822265625, 38.889148712158203125, 42.19660186767578125, 45.616455078125, 49.1982421875, 52.833171844482421875, 56.39959716796875, 59.595676422119140625, 61.15659332275390625, 61.733531951904296875, 62.398540496826171875, 64.25196075439453125, 68.2768402099609375, 73.32421875, 77.73445892333984375, 79.85933685302734375, 80.29781341552734375, 80.35269927978515625, 80.198974609375, 80.0116424560546875, 79.6936798095703125, 79.08026123046875, 78.3985595703125, 77.8780517578125, 80.8339080810546875, 91.51648712158203125, 103.66985321044921875, 110.62335205078125, 107.22917938232421875, 97.684417724609375, 85.8957672119140625, 75.28497314453125, 68.7678680419921875, 64.04471588134765625, 59.623687744140625, 54.76873779296875, 48.714839935302734375, 40.670490264892578125, 31.6658725738525390625, 23.2018756866455078125, 16.7710094451904296875, 12.1817455291748046875, 8.59807586669921875, 5.98297357559204101562, 4.29940891265869140625, 3.13884472846984863281, 2.05873084068298339844, 1.18888247013092041016, 0.66238158941268920898, 0.45427343249320983887, 0.26118096709251403809, 0.10140431672334671021, 0.00977999996393918991, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575, 0.0000199999994947575]
+time=[18230400., 18316800.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_Examples_DirectTiltedSurface.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_Examples_DirectTiltedSurface.txt
new file mode 100644
index 00000000..b97a71e5
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_SolarIrradiation_Examples_DirectTiltedSurface.txt
@@ -0,0 +1,6 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1', 'linear': ' '}
+HDirRoo.H=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.00000073511125719961, 0.00634253304451704025, 0.12573301792144775391, 3.28954410552978515625, 13.21490764617919921875, 30.263763427734375, 52.3336639404296875, 78.70415496826171875, 111.57936859130859375, 148.875244140625, 187.35302734375, 223.80926513671875, 258.4881591796875, 291.638885498046875, 323.843902587890625, 356.054931640625, 388.540771484375, 420.3414306640625, 450.298828125, 477.2783203125, 501.60601806640625, 523.630126953125, 543.59051513671875, 561.71759033203125, 576.69769287109375, 588.313232421875, 597.11962890625, 603.70111083984375, 603.4962158203125, 593.26611328125, 573.66241455078125, 545.4853515625, 489.899749755859375, 399.89422607421875, 306.903167724609375, 241.017333984375, 212.47039794921875, 189.8268585205078125, 168.5606689453125, 146.0751953125, 120.4508819580078125, 93.32006072998046875, 67.86277008056640625, 46.7584381103515625, 31.9011745452880859375, 22.159587860107421875, 15.98244762420654296875, 12.20950412750244140625, 9.85045719146728515625, 8.11099910736083984375, 6.63319492340087890625, 5.223796844482421875, 3.78003191947937011719, 2.26051783561706542969, 0.98790079355239868164, 0.23048835992813110352, 0.0010031689889729023, 0.0000037451354728546, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+HDirWal.H=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 5.10592031478881835938, 35.362438201904296875, 65.2796478271484375, 94.6805267333984375, 122.46977996826171875, 147.069244384765625, 167.4968414306640625, 182.96429443359375, 185.3991241455078125, 168.471832275390625, 142.4625091552734375, 122.2907867431640625, 117.10333251953125, 113.08880615234375, 108.13105010986328125, 100.61040496826171875, 88.88663482666015625, 73.6826019287109375, 57.291133880615234375, 42.2066497802734375, 30.810626983642578125, 22.9336566925048828125, 17.76651763916015625, 14.6282939910888671875, 12.78057003021240234375, 11.47020435333251953125, 10.31415653228759765625, 9.03959369659423828125, 7.40418004989624023438, 5.13766527175903320312, 2.70694494247436523438, 0.81237429380416870117, 0.00516948988661170006, 0.00004033894583699293, 0.00003690571247716434, 0.00003325739453430288, 0.00002940839476650581, 0.00002537391083023977, 0.00002116986797773279, 0.00001681286630628165, 0.00001232010527019156, 0.00000770932547311531, 0.00000299872954201419, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+HDirFlo.H=[0.00005689401950803585, 0.00005670095924870111, 0.00005620945012196898, 0.00005542142753256485, 0.00005434000195236877, 0.00005296944800647907, 0.0000513151717314031, 0.00004938371057505719, 0.00004718268246506341, 0.00004472077853279188, 0.00004200771945761517, 0.00003905421908712015, 0.00003587192986742593, 0.00003247342101531103, 0.00002887210757762659, 0.00002508220859454013, 0.00002111868525389582, 0.00001699718632153235, 0.00001273398538614856, 0.00000834591446619015, 0.0000038502985262312, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.00000090064213509322, 0.00000546913088328438, 0.00000994230686046649, 0.000014302521776699, 0.00001853257344919257, 0.00002261577355966438, 0.00002653600859048311, 0.00003027781531272922, 0.00003382642535143532, 0.00003716783976415172, 0.00004028887633467093, 0.00004317721322877333, 0.0000458214599348139, 0.00004821118272957392, 0.00005033694833400659, 0.00005219037120696157, 0.0000537641353730578, 0.00005505203444045037, 0.00005604898615274578, 0.00005675105785485357, 0.00005715547740692273, 0.00005726065137423575]
+time=[18230400., 18316800.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckBlackBodySkyTemperature.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckBlackBodySkyTemperature.txt
deleted file mode 100644
index 3ffb6273..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckBlackBodySkyTemperature.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-last-generated=2016-01-05
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-cheSkyBlaBodTem.TOut=[203.160003662109375, 204.55979922562482897774, 205.95959478914028295549, 207.35940561143956983869, 208.759201174953403779, 210.15899647774065783778, 211.55880756076996362935, 212.95860286355485868626, 214.35839868781062023118, 215.7581934691326068787, 217.15800455215000397402, 218.55780037640107593688, 219.95759620066124284676, 221.35740728366954499506, 222.75720206500062658961, 224.15699684634077470946, 225.55679371351186546235, 226.95660375359562976882, 228.35639853494487283569, 229.75619540210686864157, 231.15600544219063294804, 232.55580230935717622742, 233.95559709070187182078, 235.35539187202840594182, 236.75520399796124593195, 238.154998779296875, 239.55479564651344048798, 240.95460360067531269124, 242.35440046789187817922, 243.7541973351084436672, 245.15400528927031587045, 246.55380215648688135843, 247.95359902370344684641, 249.35339171917630096686, 250.75320384508188453765, 252.15300071225294686883, 253.5527934077803990931, 254.95260553367688771687, 256.35238714210436228313, 257.75219926811001869282, 259.15200722227189089608, 260.55178883069936546235, 261.95160095670502187204, 263.3514089108668940753, 264.75119051929436864157, 266.15100264530002505126, 267.55081059946189725451, 268.95059220788937182078, 270.35040433389497138705, 271.75021228805690043373, 273.149993896484375, 274.54980602247007936967, 275.94958763087771558276, 277.34939975686341995242, 278.74920353928604299654, 280.14898514787552130656, 281.54879727366943598099, 282.94860939955594858475, 284.34839100807266731863, 285.74820313405842853172, 287.14800691648099473241, 288.5477885251068528305, 289.94760065087433531517, 291.34741277678728010869, 292.74719438526767589792, 294.14700651125338026759, 295.54681029367594646828, 296.94659190208358268137, 298.34640402806928705104, 299.74618563648681401901, 301.14599776246262763379, 302.54580988844833200346, 303.94558315372933066101, 305.34539527927853441724, 306.74520740526429563033, 308.144989013671875, 309.54480113965757936967, 310.94461326535230227819, 312.34439487405091995242, 313.74419865647354299654, 315.14401078245924736621, 316.54379239089331576906, 317.94360451685258794896, 319.34341664258363380213, 320.74319825124592853172, 322.14300203366849473241, 323.5427836422943528305, 324.94259576806183531517, 326.34240789397478010869, 327.74218950245517589792, 329.14200162844088026759, 330.54180541086344646828, 331.94158701952574119787, 333.34139914525678705104, 334.74121127121605923094, 336.14099287965012763379, 337.54080500563583200346, 338.94060878805845504758, 340.34039039646603441724, 341.74020252245179563033, 343.1400146484375]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckCeilingHeight.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckCeilingHeight.txt
new file mode 100644
index 00000000..45edbb8f
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckCeilingHeight.txt
@@ -0,0 +1,5 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+cheCeiHei.ceiHeiIn=[2740., 2000., 180., 340., 2000., 2000., 2000., 2000., 2000., 3660., 120., 2000., 2000., 3050., 2000., 2000., 1160., 3660., 640., 520., 180., 270., 2000., 2000., 1680., 490., 2000., 3050., 460., 2000., 1010., 1400., 2000., 310., 670., 2000., 2000., 2000., 3350., 2000., 2000., 2000., 1010., 760., 2740., 1400., 2000., 2000., 490., 2000., 1830., 460., 2000., 7620., 520., 1370., 2000., 2130., 1010., 2000., 2000., 2440., 240., 1010., 1010., 7010., 2000., 2000., 2000., 760., 610., 2740., 2000., 2000., 2000., 2000., 2000., 2000., 2000., 2000., 2000., 760., 180., 370., 2000., 2440., 700., 180., 460., 240., 1010., 152., 9144., 10790., 2000., 2000., 7620., 1067., 2621., 2000., 2000.]
+cheCeiHei.ceiHeiOut=[2740., 2000., 180., 340., 2000., 2000., 2000., 2000., 2000., 3660., 120., 2000., 2000., 3050., 2000., 2000., 1160., 3660., 640., 520., 180., 270., 2000., 2000., 1680., 490., 2000., 3050., 460., 2000., 1010., 1400., 2000., 310., 670., 2000., 2000., 2000., 3350., 2000., 2000., 2000., 1010., 760., 2740., 1400., 2000., 2000., 490., 2000., 1830., 460., 2000., 7620., 520., 1370., 2000., 2130., 1010., 2000., 2000., 2440., 240., 1010., 1010., 7010., 2000., 2000., 2000., 760., 610., 2740., 2000., 2000., 2000., 2000., 2000., 2000., 2000., 2000., 2000., 760., 180., 370., 2000., 2440., 700., 180., 460., 240., 1010., 152., 9144., 10790., 2000., 2000., 7620., 1067., 2621., 2000., 2000.]
+time=[0., 8640000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckPressure.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckPressure.txt
new file mode 100644
index 00000000..a368fd79
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckPressure.txt
@@ -0,0 +1,5 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+chePre.PIn=[99500., 99000., 97800., 99500., 99100., 98800., 100600., 101700., 100600., 99200., 99800., 98400., 99700., 98800., 100100., 99700., 99000., 99000., 98800., 99000., 99000., 98300., 100600., 100400., 98700., 99000., 99500., 99100., 98200., 100200., 100300., 99700., 100000., 98800., 98200., 98800., 100000., 100900., 100600., 99400., 99500., 99200., 99200., 97700., 98400., 99500., 100100., 99600., 98600., 98900., 99300., 99400., 97600., 97900., 96600., 97100., 98900., 98400., 99300., 99300., 99100., 100100., 98400., 98400., 101000., 100200., 99100., 100000., 99900., 98800., 98200., 99600., 99200., 99900., 99700., 99400., 100000., 99200., 99200., 100200., 99600., 98900., 98100., 99800., 100200., 98700., 97700., 98000., 99500., 98700., 97700., 98500., 99300., 100400., 100500., 100400., 99600., 98900., 98600., 100500., 99900.]
+chePre.POut=[99500., 99000., 97800., 99500., 99100., 98800., 100600., 101700., 100600., 99200., 99800., 98400., 99700., 98800., 100100., 99700., 99000., 99000., 98800., 99000., 99000., 98300., 100600., 100400., 98700., 99000., 99500., 99100., 98200., 100200., 100300., 99700., 100000., 98800., 98200., 98800., 100000., 100900., 100600., 99400., 99500., 99200., 99200., 97700., 98400., 99500., 100100., 99600., 98600., 98900., 99300., 99400., 97600., 97900., 96600., 97100., 98900., 98400., 99300., 99300., 99100., 100100., 98400., 98400., 101000., 100200., 99100., 100000., 99900., 98800., 98200., 99600., 99200., 99900., 99700., 99400., 100000., 99200., 99200., 100200., 99600., 98900., 98100., 99800., 100200., 98700., 97700., 98000., 99500., 98700., 97700., 98500., 99300., 100400., 100500., 100400., 99600., 98900., 98600., 100500., 99900.]
+time=[0., 8640000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckRadiation.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckRadiation.txt
new file mode 100644
index 00000000..9b4b6e32
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckRadiation.txt
@@ -0,0 +1,5 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+cheDifRad.HOut=[0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752]
+cheGloRad.HOut=[0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752]
+time=[0., 8640000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckRelativeHumidity.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckRelativeHumidity.txt
new file mode 100644
index 00000000..62c6bded
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckRelativeHumidity.txt
@@ -0,0 +1,4 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+cheRelHum.relHumOut=[0.73000001907348632812, 0.72000002861022949219, 0.95999997854232788086, 0.85000002384185791016, 0.76999998092651367188, 0.74000000953674316406, 0.52999997138977050781, 0.57999998331069946289, 0.49000000953674316406, 0.77999997138977050781, 0.95999997854232788086, 0.81999999284744262695, 0.58999997377395629883, 0.70999997854232788086, 0.91000002622604370117, 0.87999999523162841797, 0.80000001192092895508, 0.80000001192092895508, 0.85000002384185791016, 0.75, 0.85000002384185791016, 0.88999998569488525391, 0.85000002384185791016, 0.85000002384185791016, 0.85000002384185791016, 0.68000000715255737305, 0.5, 0.50999999046325683594, 0.92000001668930053711, 0.66000002622604370117, 0.92000001668930053711, 0.85000002384185791016, 0.66000002622604370117, 0.75, 0.72000002861022949219, 0.63999998569488525391, 0.62000000476837158203, 0.70999997854232788086, 0.63999998569488525391, 0.5, 0.75, 0.75999999046325683594, 0.79000002145767211914, 0.62000000476837158203, 0.72000002861022949219, 0.68000000715255737305, 0.57999998331069946289, 0.57999998331069946289, 0.73000001907348632812, 0.77999997138977050781, 0.74000000953674316406, 0.68000000715255737305, 0.62000000476837158203, 0.73000001907348632812, 0.82999998331069946289, 0.69999998807907104492, 0.73000001907348632812, 0.68999999761581420898, 0.75, 0.75, 0.75999999046325683594, 0.79000002145767211914, 0.88999998569488525391, 0.66000002622604370117, 0.62999999523162841797, 0.67000001668930053711, 0.86000001430511474609, 0.67000001668930053711, 0.73000001907348632812, 0.63999998569488525391, 0.75999999046325683594, 0.58999997377395629883, 0.88999998569488525391, 0.67000001668930053711, 0.79000002145767211914, 0.72000002861022949219, 0.87999999523162841797, 0.60000002384185791016, 0.60000002384185791016, 0.92000001668930053711, 0.51999998092651367188, 0.64999997615814208984, 0.93000000715255737305, 0.85000002384185791016, 0.92000001668930053711, 0.47999998927116394043, 0.87000000476837158203, 0.93000000715255737305, 0.88999998569488525391, 0.92000001668930053711, 0.75, 0.85000002384185791016, 0.76999998092651367188, 0.72000002861022949219, 0.98900002241134643555, 0.82999998331069946289, 0.49000000953674316406, 0.89999997615814208984, 0.95999997854232788086, 0.91000002622604370117, 0.43999999761581420898]
+time=[0., 8640000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckSkyCover.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckSkyCover.txt
new file mode 100644
index 00000000..c84e761b
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckSkyCover.txt
@@ -0,0 +1,5 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+cheOpaSkyCov.nOut=[0.89999997615814208984, 0.30000001192092895508, 1., 1., 0.01099999994039535522, 0.20000000298023223877, 0.01099999994039535522, 0.01099999994039535522, 0.01099999994039535522, 1., 1., 0.01099999994039535522, 0.01099999994039535522, 1., 0.01099999994039535522, 0.01099999994039535522, 1., 1., 1., 1., 1., 1., 0.01099999994039535522, 0.01099999994039535522, 1., 1., 0.10000000149011611938, 1., 1., 0.01099999994039535522, 1., 1., 0.01099999994039535522, 0.89999997615814208984, 1., 0.01099999994039535522, 0.01099999994039535522, 0.01099999994039535522, 1., 0.10000000149011611938, 0.01099999994039535522, 0.01099999994039535522, 1., 1., 1., 1., 0.01099999994039535522, 0.01099999994039535522, 1., 0.5, 1., 0.69999998807907104492, 0.01099999994039535522, 1., 1., 1., 0.5, 1., 1., 0.01099999994039535522, 0.01099999994039535522, 0.89999997615814208984, 1., 0.69999998807907104492, 1., 0.89999997615814208984, 0.20000000298023223877, 0.01099999994039535522, 0.01099999994039535522, 1., 1., 1., 0.40000000596046447754, 0.01099999994039535522, 0.01099999994039535522, 0.10000000149011611938, 0.01099999994039535522, 0.01099999994039535522, 0.01099999994039535522, 0.01099999994039535522, 0.01099999994039535522, 1., 1., 1., 0.01099999994039535522, 1., 1., 1., 1., 1., 1., 1., 1., 1., 0.5, 0.5, 0.89999997615814208984, 1., 1., 0.01099999994039535522, 0.5]
+cheTotSkyCov.nOut=[0.89999997615814208984, 0.30000001192092895508, 1., 1., 0.01099999994039535522, 0.20000000298023223877, 0.01099999994039535522, 0.01099999994039535522, 0.01099999994039535522, 1., 1., 0.01099999994039535522, 0.01099999994039535522, 1., 0.01099999994039535522, 0.01099999994039535522, 1., 1., 1., 1., 1., 1., 0.30000001192092895508, 0.01099999994039535522, 1., 1., 0.10000000149011611938, 1., 1., 0.01099999994039535522, 1., 1., 0.01099999994039535522, 1., 1., 0.01099999994039535522, 0.01099999994039535522, 0.01099999994039535522, 1., 0.20000000298023223877, 0.01099999994039535522, 0.01099999994039535522, 1., 1., 1., 1., 0.01099999994039535522, 0.01099999994039535522, 1., 0.5, 1., 0.69999998807907104492, 0.01099999994039535522, 1., 1., 1., 0.5, 1., 1., 0.01099999994039535522, 0.01099999994039535522, 1., 1., 0.69999998807907104492, 1., 1., 1., 0.01099999994039535522, 0.01099999994039535522, 1., 1., 1., 0.40000000596046447754, 0.01099999994039535522, 0.01099999994039535522, 0.10000000149011611938, 0.01099999994039535522, 0.01099999994039535522, 0.01099999994039535522, 0.01099999994039535522, 0.01099999994039535522, 1., 1., 1., 0.01099999994039535522, 1., 1., 1., 1., 1., 1., 1., 1., 1., 0.5, 0.5, 1., 1., 1., 0.01099999994039535522, 0.89999997615814208984]
+time=[0., 8640000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckTemperature.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckTemperature.txt
new file mode 100644
index 00000000..2972a287
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckTemperature.txt
@@ -0,0 +1,5 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+cheTemDewPoi.TOut=[257.04998779296875, 267.04998779296875, 272.54998779296875, 268.149993896484375, 262.54998779296875, 259.25, 247.0500030517578125, 247.0500030517578125, 255.350006103515625, 268.75, 267.04998779296875, 271.45001220703125, 257.04998779296875, 262.04998779296875, 257.54998779296875, 266.45001220703125, 277.04998779296875, 275.95001220703125, 272.54998779296875, 267.04998779296875, 269.850006103515625, 273.149993896484375, 264.850006103515625, 268.149993896484375, 273.149993896484375, 262.04998779296875, 245.9499969482421875, 248.149993896484375, 263.75, 254.25, 264.25, 263.149993896484375, 254.25, 267.54998779296875, 267.54998779296875, 256.45001220703125, 248.149993896484375, 248.149993896484375, 257.04998779296875, 259.25, 269.850006103515625, 273.75, 275.350006103515625, 268.75, 267.04998779296875, 263.149993896484375, 255.350006103515625, 255.9499969482421875, 269.850006103515625, 267.54998779296875, 264.25, 262.04998779296875, 267.54998779296875, 272.54998779296875, 280.95001220703125, 270.350006103515625, 270.350006103515625, 266.45001220703125, 268.149993896484375, 268.350006103515625, 270.350006103515625, 269.25, 270.95001220703125, 264.25, 262.04998779296875, 267.04998779296875, 277.04998779296875, 269.850006103515625, 269.25, 276.45001220703125, 271.45001220703125, 266.45001220703125, 271.45001220703125, 267.04998779296875, 272.04998779296875, 267.54998779296875, 265.350006103515625, 269.25, 269.850006103515625, 268.75, 265.350006103515625, 273.149993896484375, 276.45001220703125, 272.54998779296875, 272.04998779296875, 277.04998779296875, 283.75, 282.04998779296875, 273.149993896484375, 273.75, 269.54998779296875, 273.149993896484375, 270.95001220703125, 269.25, 269.25, 268.75, 267.04998779296875, 280.95001220703125, 280.350006103515625, 274.04998779296875, 273.149993896484375]
+cheTemDryBul.TOut=[260.95001220703125, 271.45001220703125, 273.149993896484375, 270.350006103515625, 265.95001220703125, 263.149993896484375, 254.25, 253.149993896484375, 264.25, 272.04998779296875, 267.54998779296875, 274.25, 263.75, 266.45001220703125, 258.75, 268.149993896484375, 280.350006103515625, 279.25, 274.850006103515625, 270.95001220703125, 272.04998779296875, 274.850006103515625, 267.04998779296875, 270.350006103515625, 275.350006103515625, 267.04998779296875, 253.75, 255.9499969482421875, 264.850006103515625, 259.25, 265.350006103515625, 267.350006103515625, 259.25, 271.45001220703125, 272.04998779296875, 262.04998779296875, 253.75, 252.0500030517578125, 262.54998779296875, 268.149993896484375, 273.75, 277.54998779296875, 278.75, 275.350006103515625, 271.45001220703125, 268.149993896484375, 262.04998779296875, 262.54998779296875, 274.25, 270.95001220703125, 268.149993896484375, 267.04998779296875, 274.25, 277.04998779296875, 283.75, 275.350006103515625, 274.850006103515625, 271.45001220703125, 272.04998779296875, 273.350006103515625, 274.25, 272.54998779296875, 272.54998779296875, 269.850006103515625, 268.149993896484375, 272.54998779296875, 279.25, 275.350006103515625, 273.75, 283.149993896484375, 275.350006103515625, 273.75, 273.149993896484375, 272.54998779296875, 275.350006103515625, 272.04998779296875, 267.04998779296875, 276.45001220703125, 277.04998779296875, 269.850006103515625, 274.25, 279.25, 277.54998779296875, 274.850006103515625, 273.149993896484375, 288.149993896484375, 285.95001220703125, 283.149993896484375, 274.850006103515625, 274.850006103515625, 272.54998779296875, 275.350006103515625, 274.25, 273.149993896484375, 269.25, 270.95001220703125, 275.95001220703125, 282.54998779296875, 280.95001220703125, 275.350006103515625, 284.850006103515625]
+time=[0., 8640000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckWindDirection.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckWindDirection.txt
new file mode 100644
index 00000000..fafa43a0
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckWindDirection.txt
@@ -0,0 +1,5 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+cheWinDir.nOut=[4.7123889923095703125, 3.31612563133239746094, 5.58505344390869140625, 2.79252672195434570312, 5.06145477294921875, 4.88692188262939453125, 6.10865259170532226562, 5.23598766326904296875, 4.0142574310302734375, 4.7123889923095703125, 4.53785610198974609375, 4.53785610198974609375, 5.759586334228515625, 3.31612563133239746094, 4.7123889923095703125, 2.96705961227416992188, 3.66519141197204589844, 3.31612563133239746094, 6.28218507766723632812, 5.759586334228515625, 3.14159274101257324219, 4.363323211669921875, 5.23598766326904296875, 2.44346094131469726562, 3.14159274101257324219, 5.23598766326904296875, 5.93411922454833984375, 4.88692188262939453125, 2.96705961227416992188, 5.4105205535888671875, 0.00100000004749745131, 1.91986215114593505859, 3.83972430229187011719, 4.18879032135009765625, 4.363323211669921875, 5.58505344390869140625, 4.88692188262939453125, 4.18879032135009765625, 3.31612563133239746094, 3.66519141197204589844, 3.66519141197204589844, 4.0142574310302734375, 3.14159274101257324219, 4.7123889923095703125, 5.06145477294921875, 6.28218507766723632812, 5.759586334228515625, 3.49065852165222167969, 3.14159274101257324219, 4.363323211669921875, 4.18879032135009765625, 0.87266463041305541992, 3.14159274101257324219, 0.52359879016876220703, 2.96705961227416992188, 4.0142574310302734375, 4.363323211669921875, 0.17453292012214660645, 4.363323211669921875, 4.7123889923095703125, 5.23598766326904296875, 1.04719758033752441406, 1.91986215114593505859, 4.53785610198974609375, 5.58505344390869140625, 3.14159274101257324219, 4.53785610198974609375, 4.7123889923095703125, 4.0142574310302734375, 3.66519141197204589844, 5.4105205535888671875, 2.61799383163452148438, 4.363323211669921875, 5.23598766326904296875, 3.31612563133239746094, 4.7123889923095703125, 5.06145477294921875, 3.49065852165222167969, 5.93411922454833984375, 0.69813168048858642578, 1.57079637050628662109, 2.09439516067504882812, 3.83972430229187011719, 0.87266463041305541992, 2.61799383163452148438, 3.49065852165222167969, 2.96705961227416992188, 4.7123889923095703125, 0.52359879016876220703, 1.39626336097717285156, 4.53785610198974609375, 1.39626336097717285156, 6.28218507766723632812, 5.93411922454833984375, 0.00100000004749745131, 0.00100000004749745131, 2.96705961227416992188, 3.66519141197204589844, 5.93411922454833984375, 2.96705961227416992188, 2.96705961227416992188]
+cheWinDir.nIn=[4.7123889923095703125, 3.31612563133239746094, 5.58505344390869140625, 2.79252672195434570312, 5.06145477294921875, 4.88692188262939453125, 6.10865259170532226562, 5.23598766326904296875, 4.0142574310302734375, 4.7123889923095703125, 4.53785610198974609375, 4.53785610198974609375, 5.759586334228515625, 3.31612563133239746094, 4.7123889923095703125, 2.96705961227416992188, 3.66519141197204589844, 3.31612563133239746094, 6.28318548202514648438, 5.759586334228515625, 3.14159274101257324219, 4.363323211669921875, 5.23598766326904296875, 2.44346094131469726562, 3.14159274101257324219, 5.23598766326904296875, 5.93411922454833984375, 4.88692188262939453125, 2.96705961227416992188, 5.4105205535888671875, 0., 1.91986215114593505859, 3.83972430229187011719, 4.18879032135009765625, 4.363323211669921875, 5.58505344390869140625, 4.88692188262939453125, 4.18879032135009765625, 3.31612563133239746094, 3.66519141197204589844, 3.66519141197204589844, 4.0142574310302734375, 3.14159274101257324219, 4.7123889923095703125, 5.06145477294921875, 6.28318548202514648438, 5.759586334228515625, 3.49065852165222167969, 3.14159274101257324219, 4.363323211669921875, 4.18879032135009765625, 0.87266463041305541992, 3.14159274101257324219, 0.52359879016876220703, 2.96705961227416992188, 4.0142574310302734375, 4.363323211669921875, 0.17453292012214660645, 4.363323211669921875, 4.7123889923095703125, 5.23598766326904296875, 1.04719758033752441406, 1.91986215114593505859, 4.53785610198974609375, 5.58505344390869140625, 3.14159274101257324219, 4.53785610198974609375, 4.7123889923095703125, 4.0142574310302734375, 3.66519141197204589844, 5.4105205535888671875, 2.61799383163452148438, 4.363323211669921875, 5.23598766326904296875, 3.31612563133239746094, 4.7123889923095703125, 5.06145477294921875, 3.49065852165222167969, 5.93411922454833984375, 0.69813168048858642578, 1.57079637050628662109, 2.09439516067504882812, 3.83972430229187011719, 0.87266463041305541992, 2.61799383163452148438, 3.49065852165222167969, 2.96705961227416992188, 4.7123889923095703125, 0.52359879016876220703, 1.39626336097717285156, 4.53785610198974609375, 1.39626336097717285156, 6.28318548202514648438, 5.93411922454833984375, 0., 0., 2.96705961227416992188, 3.66519141197204589844, 5.93411922454833984375, 2.96705961227416992188, 2.96705961227416992188]
+time=[0., 8640000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckWindSpeed.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckWindSpeed.txt
new file mode 100644
index 00000000..0d439854
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckWindSpeed.txt
@@ -0,0 +1,5 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+cheWinSpe.winSpeOut=[2.59999990463256835938, 2.59999990463256835938, 2.59999990463256835938, 4.09999990463256835938, 5.19999980926513671875, 5.19999980926513671875, 4.59999990463256835938, 2.09999990463256835938, 6.19999980926513671875, 6.69999980926513671875, 4.59999990463256835938, 6.69999980926513671875, 6.69999980926513671875, 3.09999990463256835938, 2.09999990463256835938, 2.09999990463256835938, 7.19999980926513671875, 4.59999990463256835938, 6.19999980926513671875, 3.09999990463256835938, 5.69999980926513671875, 6.69999980926513671875, 2.09999990463256835938, 2.09999990463256835938, 6.19999980926513671875, 6.69999980926513671875, 8.19999980926513671875, 4.09999990463256835938, 3.09999990463256835938, 3.59999990463256835938, 0.00000099999999747524, 6.09999990463256835938, 2.59999990463256835938, 7.69999980926513671875, 3.09999990463256835938, 5.19999980926513671875, 3.09999990463256835938, 1.5, 3.09999990463256835938, 7.19999980926513671875, 2.09999990463256835938, 5.19999980926513671875, 2.59999990463256835938, 7.69999980926513671875, 2.59999990463256835938, 7.19999980926513671875, 2.59999990463256835938, 2.09999990463256835938, 4.09999990463256835938, 2.59999990463256835938, 2.09999990463256835938, 2.59999990463256835938, 6.69999980926513671875, 2.09999990463256835938, 8.19999980926513671875, 9.30000019073486328125, 2.09999990463256835938, 10.30000019073486328125, 4.09999990463256835938, 4.19999980926513671875, 4.09999990463256835938, 5.69999980926513671875, 6.69999980926513671875, 12.3999996185302734375, 2.59999990463256835938, 5.19999980926513671875, 4.59999990463256835938, 3.09999990463256835938, 1.5, 5.69999980926513671875, 10.30000019073486328125, 3.09999990463256835938, 4.59999990463256835938, 2.59999990463256835938, 3.09999990463256835938, 3.09999990463256835938, 2.09999990463256835938, 6.19999980926513671875, 4.59999990463256835938, 3.09999990463256835938, 4.59999990463256835938, 4.59999990463256835938, 4.59999990463256835938, 6.69999980926513671875, 2.59999990463256835938, 8.80000019073486328125, 3.59999990463256835938, 5.19999980926513671875, 7.69999980926513671875, 7.19999980926513671875, 7.19999980926513671875, 5.19999980926513671875, 4.09999990463256835938, 4.09999990463256835938, 0.00000099999999747524, 0.00000099999999747524, 9.30000019073486328125, 5.69999980926513671875, 6.19999980926513671875, 2.59999990463256835938, 5.69999980926513671875]
+cheWinSpe.winSpeIn=[2.59999990463256835938, 2.59999990463256835938, 2.59999990463256835938, 4.09999990463256835938, 5.19999980926513671875, 5.19999980926513671875, 4.59999990463256835938, 2.09999990463256835938, 6.19999980926513671875, 6.69999980926513671875, 4.59999990463256835938, 6.69999980926513671875, 6.69999980926513671875, 3.09999990463256835938, 2.09999990463256835938, 2.09999990463256835938, 7.19999980926513671875, 4.59999990463256835938, 6.19999980926513671875, 3.09999990463256835938, 5.69999980926513671875, 6.69999980926513671875, 2.09999990463256835938, 2.09999990463256835938, 6.19999980926513671875, 6.69999980926513671875, 8.19999980926513671875, 4.09999990463256835938, 3.09999990463256835938, 3.59999990463256835938, 0., 6.09999990463256835938, 2.59999990463256835938, 7.69999980926513671875, 3.09999990463256835938, 5.19999980926513671875, 3.09999990463256835938, 1.5, 3.09999990463256835938, 7.19999980926513671875, 2.09999990463256835938, 5.19999980926513671875, 2.59999990463256835938, 7.69999980926513671875, 2.59999990463256835938, 7.19999980926513671875, 2.59999990463256835938, 2.09999990463256835938, 4.09999990463256835938, 2.59999990463256835938, 2.09999990463256835938, 2.59999990463256835938, 6.69999980926513671875, 2.09999990463256835938, 8.19999980926513671875, 9.30000019073486328125, 2.09999990463256835938, 10.30000019073486328125, 4.09999990463256835938, 4.19999980926513671875, 4.09999990463256835938, 5.69999980926513671875, 6.69999980926513671875, 12.3999996185302734375, 2.59999990463256835938, 5.19999980926513671875, 4.59999990463256835938, 3.09999990463256835938, 1.5, 5.69999980926513671875, 10.30000019073486328125, 3.09999990463256835938, 4.59999990463256835938, 2.59999990463256835938, 3.09999990463256835938, 3.09999990463256835938, 2.09999990463256835938, 6.19999980926513671875, 4.59999990463256835938, 3.09999990463256835938, 4.59999990463256835938, 4.59999990463256835938, 4.59999990463256835938, 6.69999980926513671875, 2.59999990463256835938, 8.80000019073486328125, 3.59999990463256835938, 5.19999980926513671875, 7.69999980926513671875, 7.19999980926513671875, 7.19999980926513671875, 5.19999980926513671875, 4.09999990463256835938, 4.09999990463256835938, 0., 0., 9.30000019073486328125, 5.69999980926513671875, 6.19999980926513671875, 2.59999990463256835938, 5.69999980926513671875]
+time=[0., 8640000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_ConvertRadiation.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_ConvertRadiation.txt
new file mode 100644
index 00000000..dc95a098
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_ConvertRadiation.txt
@@ -0,0 +1,5 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+conGloRad.HOut=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+conDifRad.HOut=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+time=[0., 8640000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_ConvertRelativeHumidity.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_ConvertRelativeHumidity.txt
new file mode 100644
index 00000000..5bc7671c
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_ConvertRelativeHumidity.txt
@@ -0,0 +1,4 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+conRelHum.relHumOut=[0.73000001907348632812, 0.72000002861022949219, 0.95999997854232788086, 0.85000002384185791016, 0.76999998092651367188, 0.74000000953674316406, 0.52999997138977050781, 0.57999998331069946289, 0.49000000953674316406, 0.77999997138977050781, 0.95999997854232788086, 0.81999999284744262695, 0.58999997377395629883, 0.70999997854232788086, 0.91000002622604370117, 0.87999999523162841797, 0.80000001192092895508, 0.80000001192092895508, 0.85000002384185791016, 0.75, 0.85000002384185791016, 0.88999998569488525391, 0.85000002384185791016, 0.85000002384185791016, 0.85000002384185791016, 0.68000000715255737305, 0.5, 0.50999999046325683594, 0.92000001668930053711, 0.66000002622604370117, 0.92000001668930053711, 0.85000002384185791016, 0.66000002622604370117, 0.75, 0.72000002861022949219, 0.63999998569488525391, 0.62000000476837158203, 0.70999997854232788086, 0.63999998569488525391, 0.5, 0.75, 0.75999999046325683594, 0.79000002145767211914, 0.62000000476837158203, 0.72000002861022949219, 0.68000000715255737305, 0.57999998331069946289, 0.57999998331069946289, 0.73000001907348632812, 0.77999997138977050781, 0.74000000953674316406, 0.68000000715255737305, 0.62000000476837158203, 0.73000001907348632812, 0.82999998331069946289, 0.69999998807907104492, 0.73000001907348632812, 0.68999999761581420898, 0.75, 0.75, 0.75999999046325683594, 0.79000002145767211914, 0.88999998569488525391, 0.66000002622604370117, 0.62999999523162841797, 0.67000001668930053711, 0.86000001430511474609, 0.67000001668930053711, 0.73000001907348632812, 0.63999998569488525391, 0.75999999046325683594, 0.58999997377395629883, 0.88999998569488525391, 0.67000001668930053711, 0.79000002145767211914, 0.72000002861022949219, 0.87999999523162841797, 0.60000002384185791016, 0.60000002384185791016, 0.92000001668930053711, 0.51999998092651367188, 0.64999997615814208984, 0.93000000715255737305, 0.85000002384185791016, 0.92000001668930053711, 0.47999998927116394043, 0.87000000476837158203, 0.93000000715255737305, 0.88999998569488525391, 0.92000001668930053711, 0.75, 0.85000002384185791016, 0.76999998092651367188, 0.72000002861022949219, 1., 0.82999998331069946289, 0.49000000953674316406, 0.89999997615814208984, 0.95999997854232788086, 0.91000002622604370117, 0.43999999761581420898]
+time=[0., 8640000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_ConvertTime.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_ConvertTime.txt
new file mode 100644
index 00000000..ff8e0257
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_ConvertTime.txt
@@ -0,0 +1,5 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+conTim.modTim=[0., 777600., 1555200., 2332800., 3110400., 3888000., 4665600., 5443200.00000000093132257462, 6220800., 6998400., 7776000., 8553600., 9331200., 10108800., 10886400.00000000186264514923, 11664000., 12441600., 13219200.00000000186264514923, 13996800., 14774400., 15552000., 16329600., 17107200., 17884800., 18662400., 19440000., 20217600., 20995200., 21772800.00000000372529029846, 22550400., 23328000., 24105600., 24883200., 25660800., 26438400.00000000372529029846, 27216000., 27993600., 28771200., 29548800., 30326400., 31104000., 31881599.99999999627470970154, 32659200., 33436800., 34214400., 34992000., 35769600., 36547200., 37324800., 38102400., 38880000., 39657600., 40435200., 41212800., 41990400., 42768000., 43545600.00000000745058059692, 44323199.99999999254941940308, 45100800., 45878400., 46656000., 47433600., 48211200., 48988800., 49766400., 50544000., 51321600., 52099200., 52876800.00000000745058059692, 53654399.99999999254941940308, 54432000., 55209600., 55987200., 56764800., 57542400., 58320000., 59097600., 59875200., 60652800., 61430400., 62208000., 62985600.00000000745058059692, 63763199.99999999254941940308, 64540800., 65318400., 66096000., 66873600., 67651200., 68428800., 69206400., 69984000., 70761600., 71539200., 72316800., 73094400., 73872000., 74649600., 75427200., 76204800., 76982400., 77760000.]
+conTim.calTim=[0., 777600., 1555200., 2332800., 3110400., 3888000., 4665600., 5443200.00000000093132257462, 6220800., 6998400., 7776000., 8553600., 9331200., 10108800., 10886400.00000000186264514923, 11664000., 12441600., 13219200.00000000186264514923, 13996800., 14774400., 15552000., 16329600., 17107200., 17884800., 18662400., 19440000., 20217600., 20995200., 21772800.00000000372529029846, 22550400., 23328000., 24105600., 24883200., 25660800., 26438400.00000000372529029846, 27216000., 27993600., 28771200., 29548800., 30326400., 31104000., 345599.99999999627470970154, 1123200., 1900800., 2678400., 3456000., 4233600., 5011200., 5788800., 6566400., 7344000., 8121600., 8899200., 9676800., 10454400., 11232000., 12009600.00000000745058059692, 12787199.99999999254941940308, 13564800., 14342400., 15120000., 15897600., 16675200., 17452800., 18230400., 19008000., 19785600., 20563200., 21340800.00000000745058059692, 22118399.99999999254941940308, 22896000., 23673600., 24451200., 25228800., 26006400., 26784000., 27561600., 28339200., 29116800., 29894400., 30672000., 31449600.00000000745058059692, 691199.99999999254941940308, 1468800., 2246400., 3024000., 3801600., 4579200., 5356800., 6134400., 6912000., 7689600., 8467200., 9244800., 10022400., 10800000., 11577600., 12355200., 13132800., 13910400., 14688000.]
+time=[0., 77760000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_EquationOfTime.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_EquationOfTime.txt
new file mode 100644
index 00000000..f1b36fb7
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_EquationOfTime.txt
@@ -0,0 +1,5 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+eqnTim.nDay=[0., 864., 1728., 2592., 3456., 4320., 5184., 6048.0000000000009094947, 6912., 7776., 8640., 9504., 10368., 11232., 12096.0000000000018189894, 12960., 13824., 14688.0000000000018189894, 15552., 16416., 17280., 18144., 19008., 19872., 20736., 21600., 22464., 23328., 24192.00000000000363797881, 25056., 25920., 26784., 27648., 28512., 29376.00000000000363797881, 30239.99999999999636202119, 31104., 31968., 32832., 33696., 34560., 35424., 36288., 37152., 38016., 38880., 39744., 40608., 41472., 42336., 43200., 44064., 44928., 45792., 46656., 47520.00000000000727595761, 48384.00000000000727595761, 49247.99999999999272404239, 50112., 50976., 51840., 52704., 53568., 54432., 55296., 56160., 57024., 57888., 58752.00000000000727595761, 59615.99999999999272404239, 60479.99999999999272404239, 61344., 62208., 63072., 63936., 64800., 65664., 66528., 67392., 68256., 69120., 69984., 70848., 71712., 72576., 73440., 74304., 75168., 76032., 76896., 77760., 78624., 79488., 80352., 81216., 82080., 82944., 83808., 84672., 85536., 86400.]
+time=[0., 86400.]
+eqnTim.eqnTim=[-216.4123992919921875, -216.6817779541015625, -216.951141357421875, -217.2204742431640625, -217.489776611328125, -217.759063720703125, -218.0283203125, -218.29754638671875, -218.566741943359375, -218.8359222412109375, -219.105072021484375, -219.3741912841796875, -219.643280029296875, -219.912353515625, -220.181396484375, -220.4504241943359375, -220.7194061279296875, -220.988372802734375, -221.2573089599609375, -221.526214599609375, -221.79510498046875, -222.06396484375, -222.332794189453125, -222.601593017578125, -222.8703765869140625, -223.139129638671875, -223.4078521728515625, -223.676544189453125, -223.945220947265625, -224.2138671875, -224.48248291015625, -224.751068115234375, -225.0196380615234375, -225.288177490234375, -225.5566864013671875, -225.825164794921875, -226.0936279296875, -226.362060546875, -226.630462646484375, -226.898834228515625, -227.16717529296875, -227.4355010986328125, -227.70379638671875, -227.9720611572265625, -228.2403106689453125, -228.508514404296875, -228.776702880859375, -229.04486083984375, -229.31298828125, -229.5811004638671875, -229.8491668701171875, -230.117218017578125, -230.3852386474609375, -230.6532440185546875, -230.92120361328125, -231.18914794921875, -231.457061767578125, -231.724945068359375, -231.9927978515625, -232.2606353759765625, -232.5284271240234375, -232.79620361328125, -233.0639495849609375, -233.3316802978515625, -233.599365234375, -233.867034912109375, -234.134674072265625, -234.40228271484375, -234.66986083984375, -234.937408447265625, -235.2049407958984375, -235.4724273681640625, -235.739898681640625, -236.0073394775390625, -236.2747650146484375, -236.542144775390625, -236.80950927734375, -237.0768280029296875, -237.3441314697265625, -237.6114044189453125, -237.878662109375, -238.1458740234375, -238.4130706787109375, -238.6802215576171875, -238.947357177734375, -239.2144622802734375, -239.4815521240234375, -239.74859619140625, -240.0156097412109375, -240.2826080322265625, -240.5495758056640625, -240.8165130615234375, -241.0834197998046875, -241.3502960205078125, -241.6171417236328125, -241.88397216796875, -242.1507720947265625, -242.4175262451171875, -242.68426513671875, -242.9509735107421875, -243.2176513671875]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_GetAbsolutePath.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_GetAbsolutePath.txt
new file mode 100644
index 00000000..b40de204
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_GetAbsolutePath.txt
@@ -0,0 +1,9 @@
+last-generated=2016-11-18
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+dummy=[1., 1.]
+time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_GetHeaderElement.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_GetHeaderElement.txt
new file mode 100644
index 00000000..d36c3c3c
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_GetHeaderElement.txt
@@ -0,0 +1,6 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+latitude=[0.73268920183181762695, 0.73268920183181762695]
+longitude=[-1.53449344635009765625, -1.53449344635009765625]
+time=[0., 1.]
+timeZone=[-21600., -21600.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_LocalCivilTime.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_LocalCivilTime.txt
new file mode 100644
index 00000000..30c96afc
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_LocalCivilTime.txt
@@ -0,0 +1,5 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+locTim.locTim=[569.333251953125, 2297.333251953125, 4025.333251953125, 5753.33349609375, 7481.33349609375, 9209.3330078125, 10937.3330078125, 12665.3330078125018189894, 14393.3330078125, 16121.3330078125, 17849.333984375, 19577.333984375, 21305.333984375, 23033.333984375, 24761.33398437500363797881, 26489.333984375, 28217.333984375, 29945.33398437500363797881, 31673.333984375, 33401.33203125, 35129.33203125, 36857.33203125, 38585.33203125, 40313.33203125, 42041.33203125, 43769.33203125, 45497.33203125, 47225.33203125, 48953.33203125000727595761, 50681.33203125, 52409.33203125, 54137.33203125, 55865.33203125, 57593.33203125, 59321.33203125000727595761, 61049.33203124999272404239, 62777.33203125, 64505.33203125, 66233.3359375, 67961.3359375, 69689.3359375, 71417.3359375, 73145.3359375, 74873.3359375, 76601.3359375, 78329.3359375, 80057.3359375, 81785.3359375, 83513.3359375, 85241.3359375, 86969.3359375, 88697.3359375, 90425.3359375, 92153.3359375, 93881.3359375, 95609.33593750001455191523, 97337.33593750001455191523, 99065.33593749998544808477, 100793.3359375, 102521.3359375, 104249.3359375, 105977.3359375, 107705.3359375, 109433.3359375, 111161.3359375, 112889.3359375, 114617.3359375, 116345.3359375, 118073.33593750001455191523, 119801.33593749998544808477, 121529.33593749998544808477, 123257.3359375, 124985.3359375, 126713.3359375, 128441.3359375, 130169.3359375, 131897.328125, 133625.328125, 135353.328125, 137081.328125, 138809.328125, 140537.328125, 142265.328125, 143993.328125, 145721.328125, 147449.328125, 149177.328125, 150905.328125, 152633.328125, 154361.328125, 156089.328125, 157817.328125, 159545.328125, 161273.328125, 163001.328125, 164729.328125, 166457.328125, 168185.328125, 169913.328125, 171641.328125, 173369.328125]
+locTim.cloTim=[0., 1728., 3456., 5184., 6912., 8640., 10368., 12096.0000000000018189894, 13824., 15552., 17280., 19008., 20736., 22464., 24192.00000000000363797881, 25920., 27648., 29376.00000000000363797881, 31104., 32832., 34560., 36288., 38016., 39744., 41472., 43200., 44928., 46656., 48384.00000000000727595761, 50112., 51840., 53568., 55296., 57024., 58752.00000000000727595761, 60479.99999999999272404239, 62208., 63936., 65664., 67392., 69120., 70848., 72576., 74304., 76032., 77760., 79488., 81216., 82944., 84672., 86400., 88128., 89856., 91584., 93312., 95040.00000000001455191523, 96768.00000000001455191523, 98495.99999999998544808477, 100224., 101952., 103680., 105408., 107136., 108864., 110592., 112320., 114048., 115776., 117504.00000000001455191523, 119231.99999999998544808477, 120959.99999999998544808477, 122688., 124416., 126144., 127872., 129600., 131328., 133056., 134784., 136512., 138240., 139968., 141696., 143424., 145152., 146880., 148608., 150336., 152064., 153792., 155520., 157248., 158976., 160704., 162432., 164160., 165888., 167616., 169344., 171072., 172800.]
+time=[0., 172800.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_SolarTime.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_SolarTime.txt
new file mode 100644
index 00000000..2176c80c
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_BaseClasses_Examples_SolarTime.txt
@@ -0,0 +1,5 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+solTim.solTim=[-2047.0791015625, 6590.22802734375, 15227.5380859375, 23864.8515625, 32502.166015625, 41139.484375, 49776.8046875, 58414.12890625000727595761, 67051.453125, 75688.78125, 84326.1171875, 92963.453125, 101600.7890625, 110238.125, 118875.46875000001455191523, 127512.8203125, 136150.171875, 144787.515625, 153424.875, 162062.234375, 170699.59375, 179336.953125, 187974.328125, 196611.703125, 205249.078125, 213886.453125, 222523.828125, 231161.21875000002910383046, 239798.60937500002910383046, 248435.99999999997089616954, 257073.390625, 265710.78125, 274348.1875, 282985.59375, 291623., 300260.40625, 308897.8125, 317535.25, 326172.65625, 334810.09375, 343447.5, 352084.9375, 360722.375, 369359.8125, 377997.25, 386634.71875, 395272.15625, 403909.59375, 412547.0625, 421184.53125, 429822., 438459.46875, 447096.9375, 455734.40625, 464371.90625000005820766091, 473009.37500000005820766091, 481646.87500000005820766091, 490284.34374999994179233909, 498921.84374999994179233909, 507559.34375, 516196.84375, 524834.375, 533471.875, 542109.375, 550746.9375, 559384.4375, 568021.9375, 576659.5, 585297.0625, 593934.5625, 602572.125, 611209.6875, 619847.25, 628484.8125, 637122.375, 645759.9375, 654397.5, 663035.0625, 671672.625, 680310.25, 688947.8125, 697585.4375, 706223., 714860.625, 723498.25, 732135.8125, 740773.4375, 749411.0625, 758048.6875, 766686.3125, 775323.9375, 783961.625, 792599.25, 801236.875, 809874.5625, 818512.1875, 827149.875, 835787.5625, 844425.1875, 853062.875, 861700.5625]
+time=[0., 864000.]
+solTim.locTim=[-1830.666748046875, 6809.33349609375, 15449.3330078125, 24089.333984375, 32729.333984375, 41369.33203125, 50009.33203125, 58649.33203125000727595761, 67289.3359375, 75929.3359375, 84569.3359375, 93209.3359375, 101849.3359375, 110489.3359375, 119129.33593750001455191523, 127769.3359375, 136409.328125, 145049.328125, 153689.328125, 162329.328125, 170969.328125, 179609.328125, 188249.328125, 196889.328125, 205529.328125, 214169.328125, 222809.328125, 231449.32812500002910383046, 240089.32812500002910383046, 248729.32812499997089616954, 257369.328125, 266009.34375, 274649.34375, 283289.34375, 291929.34375, 300569.34375, 309209.34375, 317849.34375, 326489.34375, 335129.34375, 343769.34375, 352409.34375, 361049.34375, 369689.34375, 378329.34375, 386969.34375, 395609.34375, 404249.34375, 412889.34375, 421529.34375, 430169.34375, 438809.34375, 447449.34375, 456089.34375, 464729.34375000005820766091, 473369.34375000005820766091, 482009.34375000005820766091, 490649.34374999994179233909, 499289.34374999994179233909, 507929.34375, 516569.34375, 525209.3125, 533849.3125, 542489.3125, 551129.3125, 559769.3125, 568409.3125, 577049.3125, 585689.3125, 594329.3125, 602969.3125, 611609.3125, 620249.3125, 628889.3125, 637529.3125, 646169.3125, 654809.3125, 663449.3125, 672089.3125, 680729.3125, 689369.3125, 698009.3125, 706649.3125, 715289.3125, 723929.3125, 732569.3125, 741209.3125, 749849.3125, 758489.3125, 767129.3125, 775769.3125, 784409.3125, 793049.3125, 801689.3125, 810329.3125, 818969.3125, 827609.3125, 836249.3125, 844889.3125, 853529.3125, 862169.3125]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_Examples_ReaderTMY3.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_Examples_ReaderTMY3.txt
new file mode 100644
index 00000000..2d800617
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_Examples_ReaderTMY3.txt
@@ -0,0 +1,11 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1, 1', 'linear': ' '}
+weaDat.weaBus.TDewPoi=[257.04998779296875, 267.04998779296875, 272.54998779296875, 268.149993896484375, 262.54998779296875, 259.25, 247.0500030517578125, 247.0500030517578125, 255.350006103515625, 268.75, 267.04998779296875, 271.45001220703125, 257.04998779296875, 262.04998779296875, 257.54998779296875, 266.45001220703125, 277.04998779296875, 275.95001220703125, 272.54998779296875, 267.04998779296875, 269.850006103515625, 273.149993896484375, 264.850006103515625, 268.149993896484375, 273.149993896484375, 262.04998779296875, 245.9499969482421875, 248.149993896484375, 263.75, 254.25, 264.25, 263.149993896484375, 254.25, 267.54998779296875, 267.54998779296875, 256.45001220703125, 248.149993896484375, 248.149993896484375, 257.04998779296875, 259.25, 269.850006103515625, 273.75, 275.350006103515625, 268.75, 267.04998779296875, 263.149993896484375, 255.350006103515625, 255.9499969482421875, 269.850006103515625, 267.54998779296875, 264.25, 262.04998779296875, 267.54998779296875, 272.54998779296875, 280.95001220703125, 270.350006103515625, 270.350006103515625, 266.45001220703125, 268.149993896484375, 268.350006103515625, 270.350006103515625, 269.25, 270.95001220703125, 264.25, 262.04998779296875, 267.04998779296875, 277.04998779296875, 269.850006103515625, 269.25, 276.45001220703125, 271.45001220703125, 266.45001220703125, 271.45001220703125, 267.04998779296875, 272.04998779296875, 267.54998779296875, 265.350006103515625, 269.25, 269.850006103515625, 268.75, 265.350006103515625, 273.149993896484375, 276.45001220703125, 272.54998779296875, 272.04998779296875, 277.04998779296875, 283.75, 282.04998779296875, 273.149993896484375, 273.75, 269.54998779296875, 273.149993896484375, 270.95001220703125, 269.25, 269.25, 268.75, 267.04998779296875, 280.95001220703125, 280.350006103515625, 274.04998779296875, 273.149993896484375]
+weaDat.weaBus.TDryBul=[260.95001220703125, 271.45001220703125, 273.149993896484375, 270.350006103515625, 265.95001220703125, 263.149993896484375, 254.25, 253.149993896484375, 264.25, 272.04998779296875, 267.54998779296875, 274.25, 263.75, 266.45001220703125, 258.75, 268.149993896484375, 280.350006103515625, 279.25, 274.850006103515625, 270.95001220703125, 272.04998779296875, 274.850006103515625, 267.04998779296875, 270.350006103515625, 275.350006103515625, 267.04998779296875, 253.75, 255.9499969482421875, 264.850006103515625, 259.25, 265.350006103515625, 267.350006103515625, 259.25, 271.45001220703125, 272.04998779296875, 262.04998779296875, 253.75, 252.0500030517578125, 262.54998779296875, 268.149993896484375, 273.75, 277.54998779296875, 278.75, 275.350006103515625, 271.45001220703125, 268.149993896484375, 262.04998779296875, 262.54998779296875, 274.25, 270.95001220703125, 268.149993896484375, 267.04998779296875, 274.25, 277.04998779296875, 283.75, 275.350006103515625, 274.850006103515625, 271.45001220703125, 272.04998779296875, 273.350006103515625, 274.25, 272.54998779296875, 272.54998779296875, 269.850006103515625, 268.149993896484375, 272.54998779296875, 279.25, 275.350006103515625, 273.75, 283.149993896484375, 275.350006103515625, 273.75, 273.149993896484375, 272.54998779296875, 275.350006103515625, 272.04998779296875, 267.04998779296875, 276.45001220703125, 277.04998779296875, 269.850006103515625, 274.25, 279.25, 277.54998779296875, 274.850006103515625, 273.149993896484375, 288.149993896484375, 285.95001220703125, 283.149993896484375, 274.850006103515625, 274.850006103515625, 272.54998779296875, 275.350006103515625, 274.25, 273.149993896484375, 269.25, 270.95001220703125, 275.95001220703125, 282.54998779296875, 280.95001220703125, 275.350006103515625, 284.850006103515625]
+time=[0., 8640000.]
+weaDat.weaBus.HDirNor=[0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752]
+weaDat.weaBus.HGloHor=[0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752]
+weaDat.weaBus.HDifHor=[0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752]
+weaDatInpCon.weaBus.HDifHor=[0.00009999999747378752, 0.00009999999747378752]
+weaDatInpCon.weaBus.HGloHor=[0.00009999999747378752, 0.00009999999747378752]
+weaDatInpCon.weaBus.HDirNor=[0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_Validation_ReaderTMY3HDirNor.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_Validation_ReaderTMY3HDirNor.txt
new file mode 100644
index 00000000..258f46c9
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_BoundaryConditions_WeatherData_Validation_ReaderTMY3HDirNor.txt
@@ -0,0 +1,11 @@
+last-generated=2016-12-15
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": " "
+}
+weaDatInpCon.weaBus.HDifHor=[0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 2.61679792404174804688, 5.74685764312744140625, 8.854236602783203125, 11.92667293548583984375, 14.952039718627942122, 17.91839790344236860165, 20.8140392303466796875, 23.6275386810302734375, 26.347789764404296875, 28.96405792236328125, 31.4660186767578125, 33.843799591064453125, 36.0880126953125, 38.189800262451171875, 40.140872955322265625, 41.933528900146484375, 43.56069183349609375, 45.01593780517578125, 46.293529510498046875, 47.38842010498046875, 48.296291351318359375, 49.01355743408203125, 49.53739166259765625, 49.86572265625, 49.997257232666015625, 49.931476593017578125, 49.66864013671875, 49.20978164672852273043, 48.556713104248046875, 47.712017059326171875, 46.679019927978515625, 45.4618072509765625, 44.065174102783203125, 42.49463653564453125, 40.756389617919921875, 38.8572998046875, 36.8048553466796875, 34.607158660888671875, 32.27288436889646305872, 29.81124305725099787878, 27.23195266723634944128, 24.5451869964599609375, 21.761554718017578125, 18.892040252685546875, 15.9479656219482421875, 12.940952301025390625, 9.88286685943603515625, 6.78577852249145507812, 3.66190981864929199219, 0.52358919382095336914, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752]
+weaDatInpCon.HGloHor_in=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 5.23359584808349609375, 11.4937152862548828125, 17.70847320556640625, 23.8533458709716796875, 29.904079437255884244, 35.83679580688473720329, 41.628078460693359375, 47.255077362060546875, 52.69557952880859375, 57.9281158447265625, 62.932037353515625, 67.68759918212890625, 72.176025390625, 76.37960052490234375, 80.28174591064453125, 83.86705780029296875, 87.1213836669921875, 90.0318756103515625, 92.58705902099609375, 94.7768402099609375, 96.59258270263671875, 98.0271148681640625, 99.0747833251953125, 99.7314453125, 99.99451446533203125, 99.86295318603515625, 99.3372802734375, 98.41956329345704546085, 97.11342620849609375, 95.42403411865234375, 93.35803985595703125, 90.923614501953125, 88.13034820556640625, 84.9892730712890625, 81.51277923583984375, 77.714599609375, 73.609710693359375, 69.21431732177734375, 64.54576873779292611744, 59.62248611450199575756, 54.46390533447269888256, 49.090373992919921875, 43.52310943603515625, 37.78408050537109375, 31.895931243896484375, 25.88190460205078125, 19.7657337188720703125, 13.57155704498291015625, 7.32381963729858398438, 1.04717838764190673828, -0.20335340499877929688, -0.20229598879814147949, -0.20044019818305969238, -0.19779336452484130859, -0.19436594843864440918, -0.19017143547534942627, -0.1852264106273651123, -0.17955039441585540771, -0.17316575348377227783, -0.16609771549701690674, -0.15837417542934417725, -0.15002559125423431396, -0.14108492434024810791, -0.13158747553825378418, -0.12157069891691207886, -0.11107414215803146362, -0.10013922303915023804, -0.08880910277366638184, -0.07712849229574203491, -0.06514348834753036499, -0.05290139466524124146]
+time=[0., 86400.]
+weaDatInpCon.weaBus.HDirNor=[0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 1367.699951171875, 213.29132080078125, 150.2107391357421875, 128.96273803710931815658, 118.67131805419924717171, 112.86553192138671875, 109.34777069091796875, 107.1682281494140625, 105.85137939453125, 105.13468170166015625, 104.8632354736328125, 104.941680908203125, 105.31011199951171875, 105.931243896484375, 106.783172607421875, 107.8552703857421875, 109.1458740234375, 110.66106414794921875, 112.414337158203125, 114.4268798828125, 116.72852325439453125, 119.35941314697265625, 122.3725738525390625, 125.8378448486328125, 129.84757995605471592171, 134.52536010742193184342, 140.03930664062494315658, 146.623077392578125, 154.6103668212890625, 164.4938507080078125, 177.0318603515625, 193.45404052734375, 215.89404296875, 248.40576171875, 299.748687744140625, 393.003997802734375, 615.07196044921875, 1367.699951171875, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752, 0.00009999999747378752]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_LimPID.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_LimPID.txt
deleted file mode 100644
index e0163410..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_LimPID.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-last-generated=2017-03-31
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "6",
- "linear": " "
-}
-limPID.u_m=[5e-01, 5e-01]
-limPID.u_s=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-time=[0e+00, 1e+00]
-limPIDRev.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.399862188217433e-01, 7.765830937950081e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.589896390920857e-01, 8.995842568983854e-01, 8.463208019915505e-01, 7.986027192720049e-01, 7.558997059354419e-01, 7.177335023880005e-01, -3.263289134733941e-01, -3.666730701382116e-01, -4.036468820921025e-01, -4.375779599726629e-01, -4.68756997414589e-01, -4.974467092152315e-01, -5.238813341938088e-01, -5.48275856984495e-01, -5.7082443647859e-01, -5.917029499696768e-01, -6.11070427229348e-01, -6.290705120633673e-01, 3.591662318335184e-01, 3.535177933840433e-01, 3.48883929402229e-01, 3.45171033191035e-01, 3.422881035058574e-01, 3.401552153947991e-01, 3.387005922611342e-01, 3.378592425585593e-01, 3.375728130984682e-01, 3.377901316281856e-01, 3.384623239439664e-01, 3.395467686754922e-01, 3.410039246082306e-01, -6.672025399404176e-01, -6.751062421485362e-01, -6.827339743823946e-01, -6.901102505842915e-01, -6.972579275824562e-01, -7.042000277362707e-01, -7.109568762687577e-01, -7.175469506920548e-01, -7.239860462898683e-01, -7.302880138143699e-01, -7.364667566318196e-01, -7.425336809040377e-01, 2.565008123354414e-01, 2.606265306616661e-01, 2.648349207676109e-01, 2.691150790704308e-01, 2.734639571643483e-01, 2.778758970944009e-01, 2.823427926302098e-01, 2.868618423294655e-01, 2.914272645247745e-01, 2.960330115635053e-01, 3.006784827053733e-01, 3.053583756034944e-01, 3.100700378417969e-01, -6.951913883648052e-01, -7.004284958337071e-01, -7.056434303355313e-01, -7.108378895103905e-01, -7.160140810380873e-01, -7.211731660000835e-01, -7.263169325364718e-01, -7.314467515593012e-01, -7.365637555618326e-01, -7.416692254522343e-01, -7.467644737844334e-01, -7.518507814011584e-01, 2.480707937126241e-01, 2.529997002117113e-01, 2.579350589252836e-01, 2.628764380521239e-01, 2.678225553901163e-01, 2.72773768935291e-01, 2.777301084895792e-01, 2.826896965048953e-01, 2.876533674464782e-01, 2.926211512966991e-01, 2.97591915185184e-01, 3.02565450692493e-01, 3.075422346591949e-01]
-limPID.y=[-1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -9.399862188217433e-01, -7.765830937950081e-01, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -9.589896390920857e-01, -8.995842568983854e-01, -8.463208019915505e-01, -7.986027192720049e-01, -7.558997059354419e-01, -7.177335023880005e-01, 3.263289134733941e-01, 3.666730701382116e-01, 4.036468820921025e-01, 4.375779599726629e-01, 4.68756997414589e-01, 4.974467092152315e-01, 5.238813341938088e-01, 5.48275856984495e-01, 5.7082443647859e-01, 5.917029499696768e-01, 6.11070427229348e-01, 6.290705120633673e-01, -3.591662318335184e-01, -3.535177933840433e-01, -3.48883929402229e-01, -3.45171033191035e-01, -3.422881035058574e-01, -3.401552153947991e-01, -3.387005922611342e-01, -3.378592425585593e-01, -3.375728130984682e-01, -3.377901316281856e-01, -3.384623239439664e-01, -3.395467686754922e-01, -3.410039246082306e-01, 6.672025399404176e-01, 6.751062421485362e-01, 6.827339743823946e-01, 6.901102505842915e-01, 6.972579275824562e-01, 7.042000277362707e-01, 7.109568762687577e-01, 7.175469506920548e-01, 7.239860462898683e-01, 7.302880138143699e-01, 7.364667566318196e-01, 7.425336809040377e-01, -2.565008123354414e-01, -2.606265306616661e-01, -2.648349207676109e-01, -2.691150790704308e-01, -2.734639571643483e-01, -2.778758970944009e-01, -2.823427926302098e-01, -2.868618423294655e-01, -2.914272645247745e-01, -2.960330115635053e-01, -3.006784827053733e-01, -3.053583756034944e-01, -3.100700378417969e-01, 6.951913883648052e-01, 7.004284958337071e-01, 7.056434303355313e-01, 7.108378895103905e-01, 7.160140810380873e-01, 7.211731660000835e-01, 7.263169325364718e-01, 7.314467515593012e-01, 7.365637555618326e-01, 7.416692254522343e-01, 7.467644737844334e-01, 7.518507814011584e-01, -2.480707937126241e-01, -2.529997002117113e-01, -2.579350589252836e-01, -2.628764380521239e-01, -2.678225553901163e-01, -2.72773768935291e-01, -2.777301084895792e-01, -2.826896965048953e-01, -2.876533674464782e-01, -2.926211512966991e-01, -2.97591915185184e-01, -3.02565450692493e-01, -3.075422346591949e-01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_LimPIDWithReset.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_LimPIDWithReset.txt
deleted file mode 100644
index acdc1e21..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_LimPIDWithReset.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-last-generated=2017-03-10
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "6",
- "linear": " "
-}
-TSet.y=[3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02]
-plaWitRes.temSen.T=[2.931499938964844e+02, 3.484119262695312e+02, 3.289948425292969e+02, 3.152755737304688e+02, 3.1324658203125e+02, 3.131661071777344e+02, 3.131565246582031e+02, 3.131491088867188e+02, 3.131499633789062e+02, 3.131533813476562e+02, 3.131535949707031e+02, 3.131543579101562e+02, 3.1315234375e+02, 3.131483459472656e+02, 3.131475219726562e+02, 3.131539916992188e+02, 3.072774963378906e+02, 3.0189697265625e+02, 2.985395202636719e+02, 2.964700927734375e+02, 2.951952819824219e+02, 2.944099731445312e+02, 2.939262084960938e+02, 2.93628173828125e+02, 2.93444580078125e+02, 2.933314514160156e+02, 2.932617797851562e+02, 2.932188720703125e+02, 2.931924133300781e+02, 2.931761474609375e+02, 2.931661071777344e+02, 3.30798828125e+02, 3.174599609375e+02, 3.132892150878906e+02, 3.131573181152344e+02, 3.131578979492188e+02, 3.13148681640625e+02, 3.131528625488281e+02, 3.13153076171875e+02, 3.1315185546875e+02, 3.131470642089844e+02, 3.131517639160156e+02, 3.131543273925781e+02, 3.131553039550781e+02, 3.131526794433594e+02, 3.131463317871094e+02, 3.072086791992188e+02, 3.018529968261719e+02, 2.985123901367188e+02, 2.964533996582031e+02, 2.951849975585938e+02, 2.944036254882812e+02, 2.939223022460938e+02, 2.936257629394531e+02, 2.934430847167969e+02, 2.9333056640625e+02, 2.9326123046875e+02, 2.93218505859375e+02, 2.931921997070312e+02, 2.931759948730469e+02, 2.93166015625e+02, 3.307989196777344e+02, 3.174599914550781e+02, 3.132896423339844e+02, 3.131567077636719e+02, 3.131569213867188e+02, 3.131559753417969e+02, 3.131547241210938e+02, 3.131472778320312e+02, 3.131479187011719e+02, 3.131548767089844e+02, 3.13149169921875e+02, 3.131459655761719e+02, 3.131520080566406e+02, 3.131554870605469e+02, 3.131522827148438e+02, 3.071644287109375e+02, 3.018245849609375e+02, 2.984948425292969e+02, 2.964425964355469e+02, 2.951783447265625e+02, 2.943995361328125e+02, 2.939197692871094e+02, 2.936242065429688e+02, 2.93442138671875e+02, 2.933299560546875e+02, 2.932608642578125e+02, 2.932182922363281e+02, 2.931920776367188e+02, 2.931759338378906e+02, 2.931659851074219e+02, 3.307991027832031e+02, 3.174601135253906e+02, 3.132909851074219e+02, 3.131546325683594e+02, 3.131576538085938e+02, 3.131544799804688e+02, 3.131463623046875e+02, 3.131529541015625e+02, 3.131549682617188e+02, 3.131515808105469e+02]
-plaNoRes.temSen.T=[2.931499938964844e+02, 3.484119262695312e+02, 3.289948425292969e+02, 3.152755737304688e+02, 3.1324658203125e+02, 3.131661071777344e+02, 3.131565246582031e+02, 3.131491088867188e+02, 3.131499633789062e+02, 3.131533813476562e+02, 3.131535949707031e+02, 3.131543579101562e+02, 3.1315234375e+02, 3.131483459472656e+02, 3.131475219726562e+02, 3.131539916992188e+02, 3.072774963378906e+02, 3.0189697265625e+02, 2.985395202636719e+02, 2.964700927734375e+02, 2.951952819824219e+02, 2.944099731445312e+02, 2.939262084960938e+02, 2.93628173828125e+02, 2.93444580078125e+02, 2.933314514160156e+02, 2.932617797851562e+02, 2.932188720703125e+02, 2.931924133300781e+02, 2.931761474609375e+02, 2.931661071777344e+02, 3.484008483886719e+02, 3.289871520996094e+02, 3.152707824707031e+02, 3.132462463378906e+02, 3.131656799316406e+02, 3.131567993164062e+02, 3.13155029296875e+02, 3.131488647460938e+02, 3.131533203125e+02, 3.131543884277344e+02, 3.131511840820312e+02, 3.131487731933594e+02, 3.131470642089844e+02, 3.131492004394531e+02, 3.131553955078125e+02, 3.072371215820312e+02, 3.0187109375e+02, 2.985235290527344e+02, 2.964602661132812e+02, 2.95189208984375e+02, 2.9440625e+02, 2.939238891601562e+02, 2.936267395019531e+02, 2.934436950683594e+02, 2.933309326171875e+02, 2.932614440917969e+02, 2.932186584472656e+02, 2.931922912597656e+02, 2.931760559082031e+02, 2.931660461425781e+02, 3.484003295898438e+02, 3.289867858886719e+02, 3.152705688476562e+02, 3.132455139160156e+02, 3.131651611328125e+02, 3.131567687988281e+02, 3.1314990234375e+02, 3.13148193359375e+02, 3.131521606445312e+02, 3.131461486816406e+02, 3.131537170410156e+02, 3.131545715332031e+02, 3.131516418457031e+02, 3.131464538574219e+02, 3.131509704589844e+02, 3.073489379882812e+02, 3.019427490234375e+02, 2.985677490234375e+02, 2.964875183105469e+02, 2.952059936523438e+02, 2.944165954589844e+02, 2.939302673339844e+02, 2.936306762695312e+02, 2.934461059570312e+02, 2.933324279785156e+02, 2.932623901367188e+02, 2.9321923828125e+02, 2.931926574707031e+02, 2.9317626953125e+02, 2.931661987304688e+02, 3.484008178710938e+02, 3.289871215820312e+02, 3.152707824707031e+02, 3.13245361328125e+02, 3.131661071777344e+02, 3.131571350097656e+02, 3.131519165039062e+02, 3.131474609375e+02, 3.131466064453125e+02, 3.131502990722656e+02]
-time=[0e+00, 6e+02]
-conWitRes.conPID.trigger=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-conWitRes.conPID.controlError=[2e+01, -3.526193237304688e+01, -1.584483337402344e+01, -2.125560283660889e+00, -9.658388793468475e-02, -1.609850116074085e-02, -6.536549422889948e-03, 8.833190659060913e-04, 3.543465209077112e-05, -3.371275961399078e-03, -3.605998586863279e-03, -4.352406598627567e-03, -2.34312447719276e-03, 1.651575905270875e-03, 2.487042918800505e-03, -3.983934409916401e-03, -1.412749767303467e+01, -8.746961593627919e+00, -5.389506816864014e+00, -3.320106506347656e+00, -2.045281410217285e+00, -1.259975075721741e+00, -7.761939167976379e-01, -4.781661927700043e-01, -2.945695817470551e-01, -1.814665645360947e-01, -1.117905750870705e-01, -6.886745989322662e-02, -4.242523014545431e-02, -2.613933384418488e-02, -1.610524766147137e-02, -1.764884376525879e+01, -4.309948444366455e+00, -1.392185837030411e-01, -7.325411774221437e-03, -7.89451040327549e-03, 1.328387414105237e-03, -2.872083801776171e-03, -3.067557234317064e-03, -1.85817142482847e-03, 2.927914494648576e-03, -1.774785341693821e-03, -4.340045154094696e-03, -5.308048333972692e-03, -2.665657782927155e-03, 3.668532939627767e-03, -1.405867481231689e+01, -8.703003883361816e+00, -5.362389087677002e+00, -3.30340051651001e+00, -2.034990310668945e+00, -1.253635287284851e+00, -7.722883224487305e-01, -4.757601916790009e-01, -2.930873930454254e-01, -1.805534511804581e-01, -1.112280637025828e-01, -6.852092593908342e-02, -4.221176728606224e-02, -2.600785344839096e-02, -1.602421142160892e-02, -1.76489143371582e+01, -4.309996128082275e+00, -1.396490484476089e-01, -6.709670182317495e-03, -6.930092349648476e-03, -5.986312869936228e-03, -4.738443531095982e-03, 2.70803342573152e-03, 2.085099928079823e-03, -4.888832569122314e-03, 8.366231922991574e-04, 4.037590697407722e-03, -2.009411109611392e-03, -5.475097335875034e-03, -2.276649931445718e-03, -1.401442813873291e+01, -8.674580574035645e+00, -5.344851016998291e+00, -3.292595624923706e+00, -2.028334140777588e+00, -1.249534845352167e+00, -7.69762277603153e-01, -4.742040634155273e-01, -2.921287417411804e-01, -1.799629032611847e-01, -1.108642593026161e-01, -6.829681247472763e-02, -4.207369312644005e-02, -2.59227566421032e-02, -1.597179658710957e-02, -1.764910507202148e+01, -4.310122966766357e+00, -1.40986368060112e-01, -4.62004542350769e-03, -7.656408939510584e-03, -4.47939382866025e-03, 3.624559147283435e-03, -2.961088204756379e-03, -4.956797230988741e-03, -1.586082624271512e-03]
-conNoRes.conPID.controlError=[2e+01, -3.526193237304688e+01, -1.584483337402344e+01, -2.125560283660889e+00, -9.658388793468475e-02, -1.609850116074085e-02, -6.536549422889948e-03, 8.833190659060913e-04, 3.543465209077112e-05, -3.371275961399078e-03, -3.605998586863279e-03, -4.352406598627567e-03, -2.34312447719276e-03, 1.651575905270875e-03, 2.487042918800505e-03, -3.983934409916401e-03, -1.412749767303467e+01, -8.746961593627919e+00, -5.389506816864014e+00, -3.320106506347656e+00, -2.045281410217285e+00, -1.259975075721741e+00, -7.761939167976379e-01, -4.781661927700043e-01, -2.945695817470551e-01, -1.814665645360947e-01, -1.117905750870705e-01, -6.886745989322662e-02, -4.242523014545431e-02, -2.613933384418488e-02, -1.610524766147137e-02, -3.525085067749023e+01, -1.583714389801025e+01, -2.120792865753174e+00, -9.623637050389244e-02, -1.566809415817261e-02, -6.790935061872005e-03, -5.037213210016489e-03, 1.125006936490536e-03, -3.33554157987237e-03, -4.395510070025921e-03, -1.172682037577991e-03, 1.238805591128767e-03, 2.942422870546579e-03, 8.108585607260466e-04, -5.402570590376854e-03, -1.408711338043213e+01, -8.721078872680664e+00, -5.373537540435791e+00, -3.310268640518188e+00, -2.039221286773682e+00, -1.256241798400879e+00, -7.738940119743347e-01, -4.767493605613708e-01, -2.936967313289642e-01, -1.809288412332535e-01, -1.114593222737307e-01, -6.86633884906772e-02, -4.229952767491341e-02, -2.606192789971828e-02, -1.605752669274807e-02, -3.525032806396484e+01, -1.583679866790771e+01, -2.120578765869141e+00, -9.551340341567993e-02, -1.514780800789595e-02, -6.76281051710248e-03, 9.426685573998839e-05, 1.813470735211382e-03, -2.164251171053463e-03, 3.852292196825147e-03, -3.70527314953506e-03, -4.567405674606562e-03, -1.627948600798845e-03, 3.55414766818285e-03, -9.627945255488157e-04, -1.419893455505371e+01, -8.792753219604492e+00, -5.417759418487549e+00, -3.337512016296387e+00, -2.05600380897522e+00, -1.266580462455744e+00, -7.802630662918126e-01, -4.806729853153229e-01, -2.961138486862183e-01, -1.824178844690323e-01, -1.123766303062439e-01, -6.922849267721176e-02, -4.264764487743378e-02, -2.627638541162014e-02, -1.618967950344086e-02, -3.525083160400391e+01, -1.583712673187256e+01, -2.120782613754272e+00, -9.537171572446823e-02, -1.609359867870808e-02, -7.121274247765541e-03, -1.919033122248948e-03, 2.538214903324842e-03, 3.407983342185616e-03, -3.116138686891645e-04]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_NumberOfRequests.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_NumberOfRequests.txt
deleted file mode 100644
index 44741cf2..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_NumberOfRequests.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-last-generated=2017-01-13
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-numReq.u[1]=[0., 0.12533323744971558433, 0.24868989533082475063, 0.36812455241538011297, 0.48175368690617687006, 0.58778523634512991336, 0.68454713843207026791, 0.77051323409946215204, 0.8443279384363054918, 0.90482703867151026422, 0.9510565340027345993, 0.98228722941836554838, 0.9980267303235078602, 0.9980267241165654557, 0.98228722941836554838, 0.95105656226047341484, 0.90482703867151026422, 0.84432793843630538078, 0.77051329293908510376, 0.6845471041974796611, 0.58778527400645275147, 0.48175360443844000846, 0.36812453062441358176, 0.24868994052229564939, 0.12533316768907137861, 0.00000000000000012246, -0.12533335336355946876, -0.24868975891368727549, -0.36812453062441391483, -0.48175376837626832094, -0.58778512170174834761, -0.6845471041974796611, -0.77051329293908510376, -0.84432783660181121022, -0.90482703867151048627, -0.95105656226047330382, -0.9822871922079218221, -0.9980267241165654557, -0.9980267241165654557, -0.9822871922079218221, -0.95105656226047330382, -0.90482703867151048627, -0.84432783660181121022, -0.77051329293908510376, -0.6845471041974796611, -0.58778512170174834761, -0.48175376837626832094, -0.36812453062441391483, -0.24868975891368727549, -0.12533335336355946876, -0.00000000000000024493, 0.12533335336179080022, 0.24869012128477269163, 0.36812487719620695659, 0.48175343923447266903, 0.58778512170357111177, 0.68454710419715092407, 0.7705132929382439988, 0.8443280367726911928, 0.90482719487359475341, 0.95105644385979148936, 0.98228719220845672755, 0.99802672411663273522, 0.99802672411663273522, 0.98228719220845672755, 0.95105644385979148936, 0.90482719487359475341, 0.8443280367726911928, 0.7705132929382439988, 0.68454710419715092407, 0.58778512170357111177, 0.48175343923447266903, 0.36812487719620695659, 0.24869012128477269163, 0.12533335336179080022, 0.00000000000000036739, -0.12533335336179080022, -0.24869012128477269163, -0.36812487719620695659, -0.48175343923447266903, -0.58778512170357111177, -0.68454710419715092407, -0.7705132929382439988, -0.8443280367726911928, -0.90482719487359475341, -0.95105644385979148936, -0.98228719220845672755, -0.99802672411663273522, -0.99802672411663273522, -0.98228719220845672755, -0.95105644385979148936, -0.90482719487359475341, -0.8443280367726911928, -0.7705132929382439988, -0.68454710419715092407, -0.58778512170357111177, -0.48175343923447266903, -0.36812487719620695659, -0.24869012128477269163, -0.12533335336179080022, -0.00000000000000048986]
-numReq.y=[1., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.00000298022618806631, 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 2., 2., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.00000596036356004248, 2., 2., 2., 2., 2., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
-numReq.u[2]=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.00000298022618806631, 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.00000596036355997443, 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_OffTimer.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_OffTimer.txt
deleted file mode 100644
index 671ed202..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_OffTimer.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-offTim1.y=[0., 0.01000000000000000021, 0.02000000000000000042, 0.02999999999999999889, 0.04000000000000000083, 0.05000000000000000278, 0.05999999999999999778, 0.07000000000000000666, 0.08000000000000000167, 0.08999999999999999667, 0.10000000000000000555, 0.01000000037252792018, 0.02000000223516917863, 0.03000000409781489186, 0.03999999850988500416, 0.04999999478460467883, 0.06000000223516752107, 0.06999999850989055417, 0.07999999105932992238, 0.09000000596045559798, 0.09999999850988389172, 0.11000000596046446977, 0.11999999850988388173, 0.12999999105933437993, 0.14000000596046446866, 0.15000000596046447754, 0.16000000596046448642, 0.16999999105930330145, 0.18000000596046450418, 0.19000000596046445756, 0.19999999105930327259, 0.00999999739230233997, 0.02000000670550922122, 0.02999998621646254859, 0.03999999552965832761, 0.0500000067055114128, 0.05999998435380737849, 0.06999999552966940097, 0.08000000298023224321, 0.09000001788134015523, 0.09999999552965166405, 0.11000000298023221434, 0.12000001043081282015, 0.12999998807912432897, 0.14000000298023224099, 0.15000001788130462588, 0.1599999880791332374, 0.17000000298023221212, 0.1800000178813134788, 0.18999998807907103604, 0.20000000298023223877, 0.01000000931306588639, 0.02000001862613177278, 0.03000002793922430105, 0.03999997764861795008, 0.04999998882432898917, 0.05999999627467866858, 0.07000000745044732131, 0.08000001490091246392, 0.09000002980183387236, 0.09999997764861345839, 0.10999998509910524636, 0.11999999254950821648, 0.12999999999992895017, 0.14000001490094804435, 0.15000002980178950285, 0.15999997019826384115, 0.16999998509908753608, 0.18000000000010663026, 0.19000000000003547385, 0.19999882282823017166, 0.01000002123379496038, 0.01999997094321525476, 0.02999998025629890125, 0.03999998956934702754, 0.05000000074505805969, 0.06000000819547879338, 0.0700000193711542984, 0.08000002682166386381, 0.08999998211892634714, 0.0999999895693648444, 0.10999999701974116917, 0.12000000447024172789, 0.13000001192068022515, 0.14000002682169931933, 0.14999998211896181655, 0.15999998211892629829, 0.16999999701983881106, 0.18000001192082237811, 0.19000001192071580558, 0.19999764267621711333, 0.00999997355089076584, 0.01999998286394443978, 0.02999999217701698404, 0.04000000149014715234, 0.05000001266578713022, 0.06000002011620787085, 0.06999997168832659822, 0.07999997913872958222, 0.08999999403967762213, 0.10000000149011611938]
-offTim1.u=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0.99999403963644006854, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0.99998807927282451491, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
-time=[0., 1.]
-offTim2.u=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.00000596036355997443, 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.00001192072717545907, 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-offTim2.y=[0., 0.01000000000000000021, 0.02000000000000000042, 0.02999999999999999889, 0.04000000000000000083, 0.05000000000000000278, 0.05999999999999999778, 0.07000000000000000666, 0.08000000000000000167, 0.08999999999999999667, 0.10000000000000000555, 0.11000000000000000056, 0.11999999999999999556, 0.13000000000000000444, 0.14000000000000001332, 0.14999999999999999445, 0.16000000000000000333, 0.17000000000000001221, 0.17999999999999999334, 0.19000000000000000222, 0.2000000000000000111, 0.01000000633298128716, 0.02000000074505584036, 0.02999999515713427933, 0.04000000447033835727, 0.05000000074505805969, 0.06000000819562090193, 0.0699999895692271501, 0.07999999701977222877, 0.09000001192089784885, 0.0999999895691871532, 0.10999999701977664079, 0.12000000447034836482, 0.12999998211870428255, 0.13999999701976778566, 0.15000001192088452395, 0.15999998211871313547, 0.16999999701976775679, 0.18000001192089343238, 0.1900000119209289684, 0.19999999701976778343, 0.01000000335275458285, 0.02000001266596257432, 0.02999999217691035058, 0.04000000149011168071, 0.05000001266596482141, 0.05999999031426078711, 0.07000000149011165185, 0.08000000894069669855, 0.08999999403953551358, 0.10000000149011611938, 0.11000000894055461664, 0.1200000163909931139, 0.13000002384143161116, 0.13999997913869410837, 0.14999999403971320255, 0.15999999403951781218, 0.17000000894059008605, 0.18000002384148483525, 0.19000002384146708057, 0.19999997913872957778, 0.00999998547161428872, 0.01999999478467351377, 0.03000000409774383758, 0.04000001341080528655, 0.0500000245865163187, 0.05999997243329146385, 0.06999998360903358918, 0.0799999910594365593, 0.0900000059604910696, 0.10000001341082298545, 0.11000002086130589163, 0.11999996870809435945, 0.12999997615856839772, 0.13999999105944538336, 0.15000000596046447754, 0.16000000596032237787, 0.17000002086134147206, 0.18000003576214740342, 0.1899999761584618696, 0.19999999105948096378, 0.00999999739226686835, 0.02000000670540258776, 0.03000001601848401381, 0.04000002533153435708, 0.04999997690359980068, 0.05999998435402053437, 0.06999999552974045525, 0.08000000298016118894, 0.09000001788112699241, 0.10000002533152997641, 0.10999997317839836641, 0.11999998062880135041, 0.12999998807923096589, 0.14000000298026771262, 0.15000001788112693468, 0.16000001788107365286, 0.16999997317833615007, 0.17999998807935524425, 0.18999998807921314459, 0.20000000298023223877]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_PIDHysteresis.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_PIDHysteresis.txt
deleted file mode 100644
index d629074d..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_PIDHysteresis.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-last-generated=2017-03-31
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "2",
- "linear": " "
-}
-con.u_m=[3.131499938964844e+02, 3.121692504882812e+02, 3.128728942871094e+02, 3.1330224609375e+02, 3.132347717285156e+02, 3.131435852050781e+02, 3.131365051269531e+02, 3.131514282226562e+02, 3.131563110351562e+02, 3.131552124023438e+02, 3.131545715332031e+02, 3.131550598144531e+02, 3.131557006835938e+02, 3.131561279296875e+02, 3.13156494140625e+02, 3.131568298339844e+02, 3.131571655273438e+02, 3.13157470703125e+02, 3.1315771484375e+02, 3.13157958984375e+02, 3.131581726074219e+02, 3.131583557128906e+02, 3.131585083007812e+02, 3.131585998535156e+02, 3.1315869140625e+02, 3.131587219238281e+02, 3.131587219238281e+02, 3.1315869140625e+02, 3.131586303710938e+02, 3.131585388183594e+02, 3.131584167480469e+02, 3.131582641601562e+02, 3.131580505371094e+02, 3.131578369140625e+02, 3.131617736816406e+02, 3.13182861328125e+02, 3.132209777832031e+02, 3.132749938964844e+02, 3.133438110351562e+02, 3.134261474609375e+02, 3.135208129882812e+02, 3.136264953613281e+02, 3.137419128417969e+02, 3.138656921386719e+02, 3.139965515136719e+02, 3.14133056640625e+02, 3.138219909667969e+02, 3.134593811035156e+02, 3.131069641113281e+02, 3.127633361816406e+02, 3.124270629882812e+02, 3.123771362304688e+02, 3.13404296875e+02, 3.135814819335938e+02, 3.137370910644531e+02, 3.138847045898438e+02, 3.140231018066406e+02, 3.141460876464844e+02, 3.137489318847656e+02, 3.133481140136719e+02, 3.12942626953125e+02, 3.12531494140625e+02, 3.122622985839844e+02, 3.133315124511719e+02, 3.134608459472656e+02, 3.134941711425781e+02, 3.135094909667969e+02, 3.135063781738281e+02, 3.134844360351562e+02, 3.134434204101562e+02, 3.133830871582031e+02, 3.133033142089844e+02, 3.132041015625e+02, 3.131154479980469e+02, 3.131222534179688e+02, 3.131417541503906e+02, 3.131447143554688e+02, 3.131419372558594e+02, 3.131408996582031e+02, 3.131412353515625e+02, 3.131416320800781e+02, 3.131417846679688e+02, 3.131419372558594e+02, 3.131421508789062e+02, 3.131424255371094e+02, 3.131427307128906e+02, 3.131430358886719e+02, 3.131433715820312e+02, 3.131437377929688e+02, 3.131441345214844e+02, 3.131445617675781e+02, 3.131449890136719e+02, 3.131454467773438e+02, 3.131459350585938e+02, 3.131464233398438e+02, 3.131469421386719e+02, 3.131474609375e+02, 3.131479797363281e+02, 3.131485290527344e+02, 3.131490783691406e+02, 3.131496276855469e+02]
-con.u_s=[3.131499938964844e+02, 3.131499938964844e+02]
-time=[0e+00, 8.64e+04]
-con.y=[0e+00, 1e+00, 1e+00, 6.480492353439331e-01, 5.199424624443054e-01, 5.658601522445679e-01, 5.939862132072449e-01, 5.872408747673035e-01, 5.755020380020142e-01, 5.681260824203491e-01, 5.619022250175476e-01, 5.545501112937927e-01, 5.461594462394714e-01, 5.371874570846558e-01, 5.277493596076965e-01, 5.178221464157104e-01, 5.074201822280884e-01, 4.965904653072357e-01, 4.853803813457489e-01, 4.738342463970184e-01, 4.619968235492706e-01, 4.499143958091736e-01, 4.376346468925476e-01, 4.252062141895294e-01, 4.126785397529602e-01, 4.001010060310364e-01, 3.875231742858887e-01, 3.749944865703583e-01, 3.625643253326415e-01, 3.502817153930664e-01, 3.381956219673157e-01, 3.263532817363739e-01, 3.148019313812256e-01, 3.035869300365448e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 4.075271785259247e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 2.55129251058861e-13, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 5.443316102027893e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.569125533103943e-01, 4.014727473258972e-01, 4.060319066047668e-01, 4.113051891326904e-01, 4.236850142478943e-01, 4.373598694801331e-01, 4.499325454235077e-01, 4.618640542030334e-01, 4.736209809780121e-01, 4.851816594600677e-01, 4.964136481285095e-01, 5.072499513626099e-01, 5.176595449447632e-01, 5.276066064834595e-01, 5.370505452156067e-01, 5.459533333778381e-01, 5.542797446250916e-01, 5.619972944259644e-01, 5.690758228302002e-01, 5.754870772361755e-01, 5.812057852745056e-01, 5.862093567848206e-01, 5.904780626296997e-01, 5.939949750900269e-01, 5.967462658882141e-01, 5.987211465835571e-01, 5.999116897583008e-01, 6.003133058547974e-01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_PIDHysteresisTimer.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_PIDHysteresisTimer.txt
deleted file mode 100644
index 8bbf857f..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_PIDHysteresisTimer.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-last-generated=2017-03-31
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "2",
- "linear": " "
-}
-con.u_m=[2.931499938964844e+02, 2.898402099609375e+02, 2.868109436035156e+02, 2.840455322265625e+02, 2.815286560058594e+02, 2.792460327148438e+02, 2.771845397949219e+02, 2.753319702148438e+02, 2.736769714355469e+02, 2.72208984375e+02, 2.709181823730469e+02, 2.6979541015625e+02, 2.717224426269531e+02, 2.772925720214844e+02, 2.824774475097656e+02, 2.873132629394531e+02, 2.918330078125e+02, 2.960664672851562e+02, 3.000406799316406e+02, 3.037799987792969e+02, 3.073065490722656e+02, 3.106400756835938e+02, 3.132924499511719e+02, 3.131466674804688e+02, 3.131512145996094e+02, 3.131510925292969e+02, 3.131510925292969e+02, 3.131510925292969e+02, 3.131510620117188e+02, 3.131510620117188e+02, 3.131510314941406e+02, 3.131510009765625e+02, 3.131510009765625e+02, 3.131509704589844e+02, 3.131509094238281e+02, 3.1315087890625e+02, 3.131508483886719e+02, 3.131507873535156e+02, 3.131507568359375e+02, 3.131506958007812e+02, 3.131525268554688e+02, 3.131973266601562e+02, 3.132941284179688e+02, 3.134329528808594e+02, 3.136045227050781e+02, 3.138001098632812e+02, 3.140115966796875e+02, 3.134801940917969e+02, 3.117763366699219e+02, 3.102267456054688e+02, 3.088121643066406e+02, 3.075148010253906e+02, 3.063183288574219e+02, 3.052077941894531e+02, 3.041695861816406e+02, 3.031914367675781e+02, 3.022619934082031e+02, 3.013710632324219e+02, 3.005094909667969e+02, 3.049730529785156e+02, 3.10329345703125e+02, 3.13422607421875e+02, 3.133167724609375e+02, 3.131485900878906e+02, 3.131491394042969e+02, 3.131491088867188e+02, 3.131490783691406e+02, 3.131490478515625e+02, 3.131490173339844e+02, 3.131489868164062e+02, 3.131489562988281e+02, 3.131489562988281e+02, 3.1314892578125e+02, 3.1314892578125e+02, 3.1314892578125e+02, 3.131488952636719e+02, 3.1314892578125e+02, 3.1314892578125e+02, 3.1314892578125e+02, 3.131489562988281e+02, 3.131489562988281e+02, 3.131489868164062e+02, 3.131490173339844e+02, 3.131490478515625e+02, 3.131490783691406e+02, 3.131491088867188e+02, 3.13149169921875e+02, 3.131492004394531e+02, 3.131492614746094e+02, 3.131492919921875e+02, 3.131493530273438e+02, 3.131494140625e+02, 3.131494750976562e+02, 3.131495361328125e+02, 3.131495971679688e+02, 3.13149658203125e+02, 3.131497192382812e+02, 3.131497802734375e+02, 3.131498718261719e+02, 3.131499328613281e+02, 3.131499938964844e+02]
-con.u_s=[3.131499938964844e+02, 3.131499938964844e+02]
-time=[0e+00, 8.64e+04]
-con.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.000729620456696e-01, 5.353602766990662e-01, 5.156071186065674e-01, 5.000156760215759e-01, 4.843158721923828e-01, 4.686791002750397e-01, 4.531663656234741e-01, 4.378382861614227e-01, 4.227557480335236e-01, 4.079779386520386e-01, 3.935632705688477e-01, 3.795686662197113e-01, 3.66049438714981e-01, 3.530588746070862e-01, 3.406482040882111e-01, 3.288664221763611e-01, 3.177599906921387e-01, 3.073727786540985e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 3.00000011920929e-01, 3.00000011920929e-01, 3.027637302875519e-01, 3.414375483989716e-01, 3.530126810073853e-01, 3.66027444601059e-01, 3.795450031757355e-01, 3.935383260250093e-01, 4.079525768756865e-01, 4.227296710014342e-01, 4.378118216991425e-01, 4.531393647193909e-01, 4.686518907546997e-01, 4.842880964279175e-01, 4.99986320734024e-01, 5.156846046447754e-01, 5.313209891319275e-01, 5.46833872795105e-01, 5.621617436408997e-01, 5.772446990013123e-01, 5.920220613479614e-01, 6.06437087059021e-01, 6.204312443733215e-01, 6.339502930641174e-01, 6.469409465789795e-01, 6.59351646900177e-01, 6.711337566375732e-01, 6.822400689125061e-01, 6.926271915435791e-01, 7.022541761398315e-01, 7.110830545425415e-01, 7.190788388252258e-01, 7.262099981307983e-01, 7.32448399066925e-01, 7.377693057060242e-01, 7.421519160270691e-01, 7.455788850784302e-01, 7.480366826057434e-01, 7.495155930519104e-01, 7.500098347663879e-01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_SignalRanker.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_SignalRanker.txt
deleted file mode 100644
index 0843ab97..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Examples_SignalRanker.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-sigRan.u[1]=[0., 0.12533323744971558433, 0.24868989533082475063, 0.36812455241538011297, 0.48175368692903930423, 0.58778523634512991336, 0.68454713843207026791, 0.77051323409946215204, 0.8443279384363054918, 0.90482703867151026422, 0.9510565340027345993, 0.98228722941836554838, 0.9980267303235078602, 0.9980267241165654557, 0.98228722941836554838, 0.95105656226047341484, 0.90482703867151026422, 0.84432793843630538078, 0.77051329293908510376, 0.6845471041974796611, 0.58778527400645275147, 0.48175360490634872024, 0.36812453062441358176, 0.24868994052229564939, 0.12533316768907137861, 0.00000000000000012246, -0.12533335336355946876, -0.24868975891368727549, -0.36812453062441391483, -0.48175376837626832094, -0.58778512170174834761, -0.6845471041974796611, -0.77051329293908510376, -0.84432783660181121022, -0.90482703867151048627, -0.95105656226047330382, -0.9822871922079218221, -0.9980267241165654557, -0.9980267241165654557, -0.9822871922079218221, -0.95105656226047330382, -0.90482703867151048627, -0.84432783660181121022, -0.77051329293908510376, -0.6845471041974796611, -0.58778512170174834761, -0.48175376837626832094, -0.36812453062441391483, -0.24868975891368727549, -0.12533335336355946876, -0.00000000000000024493, 0.12533335336179080022, 0.24869012128477269163, 0.36812487719620695659, 0.48175343923447266903, 0.58778512170357111177, 0.68454710419715092407, 0.7705132929382439988, 0.8443280367726911928, 0.90482719487359475341, 0.95105644385979148936, 0.98228719220845672755, 0.99802672411663273522, 0.99802672411663273522, 0.98228719220845672755, 0.95105644385979148936, 0.90482719487359475341, 0.8443280367726911928, 0.7705132929382439988, 0.68454710419715092407, 0.58778512170357111177, 0.48175343923447266903, 0.36812487719620695659, 0.24869012128477269163, 0.12533335336179080022, 0.00000000000000036739, -0.12533335336179080022, -0.24869012128477269163, -0.36812487719620695659, -0.48175343923447266903, -0.58778512170357111177, -0.68454710419715092407, -0.7705132929382439988, -0.8443280367726911928, -0.90482719487359475341, -0.95105644385979148936, -0.98228719220845672755, -0.99802672411663273522, -0.99802672411663273522, -0.98228719220845672755, -0.95105644385979148936, -0.90482719487359475341, -0.8443280367726911928, -0.7705132929382439988, -0.68454710419715092407, -0.58778512170357111177, -0.48175343923447266903, -0.36812487719620695659, -0.24869012128477269163, -0.12533335336179080022, -0.00000000000000048986]
-sigRan.u[3]=[0., 0.58193672758842807102, 0.93222433969867501968, 0.92294852362730916973, 0.56473781099155007102, 0.0000000445020641171, -0.55355537001409316211, -0.88675921538246205156, -0.87793578713185949081, -0.53719542566424594021, -0.00000008466318798805, 0.52655812664543144574, 0.84351149702457073332, 0.83511825279896834129, 0.51099594989776997433, 0.00000032213646476709, -0.50087770454174007639, -0.80237289892985752537, -0.79438928745491732553, -0.48607428255131474026, -0.00000015321284262126, 0.47644972615122294091, 0.76324076860438350156, 0.75564640302484975543, 0.46236802414670519212, 0.00000000000000047688, -0.45321308876825139311, -0.72601687600025088809, -0.71879304950829014942, -0.43981795882139268494, -0.00000055453085316681, 0.43110921733261298172, 0.69060887546401039661, 0.68373725564999676685, 0.41836822601711359804, -0.00000026269015998563, -0.41008333585724776604, -0.65692733363864064255, -0.65039078509618042379, -0.39796354216825385874, -0.00000025088014087016, 0.39008393283169767729, 0.62488878460857943953, 0.61867101762918241814, 0.37855503689290809222, -0.00000047538379013134, -0.37105893237058412693, -0.59441251652989890442, -0.5884978368747760813, -0.36009304579885026421, -0.00000000000000074279, 0.35296270743746521736, 0.56542282009323718839, 0.5597961672619614637, 0.34253143032715055449, 0.00000043186260427486, -0.33574818370815218138, -0.53784668404447388834, -0.53249473778151046321, -0.32582461548302843468, -0.00000082160086994909, 0.31937322911728016628, 0.51161551739209942813, 0.50652485946691649943, 0.30993430197542637394, -0.00000077841108340961, -0.30379689057499381644, -0.4866635988941319102, -0.48182144815217253786, -0.29481896321012102113, 0.0000003702237364657, 0.288981702438143917, 0.462928581902849412, 0.45832282660288503617, 0.28044073257217516648, 0.00000000000000254591, -0.27488765531473713377, -0.44035173465036431262, -0.43596972317358795301, -0.26676374772184308082, -0.00000033633495046675, 0.26148096115523400407, 0.4188754423513013081, 0.41470733687416205804, 0.25375246037653248488, 0.00000063986341405919, -0.24872810631039179996, -0.39844654534179602123, -0.39448193925685731687, -0.24137708410968375383, 0.00000060622715344873, 0.23659725164798767194, 0.3790139866974083227, 0.37524293576908973602, 0.22960523748942221478, -0.00000028833054082653, -0.22505918589350193404, -0.36052915209076136227, -0.35694217642876641117, -0.21840747696428625124, -0.00000000000000090104]
-sigRan.u[2]=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
-time=[0., 1.]
-sigRan.y[2]=[0., 0.58193672758842807102, 0.93222433969867501968, 0.92294852362730916973, 0.56473781099155007102, 0.58778523634512991336, 0.68454713843207026791, 0.77051323409946215204, 0.8443279384363054918, 0.90482703867151026422, 0.9510565340027345993, 0.98228722941836554838, 0.9980267303235078602, 0.83511825279896834129, 0.51099594989776997433, 0.00000032213646476709, 0., 0., 0., 0., 0., 0.47644972615122294091, 0.36812453062441358176, 0.24868994052229564939, 0.12533316768907137861, 0.00000000000000012246, -0.12533335336355946876, -0.24868975891368727549, -0.36812453062441391483, -0.43981795882139268494, -0.00000055453085316681, 0.43110921733261298172, 0.69060887546401039661, 0.68373725564999676685, 0.41836822601711359804, -0.00000026269015998563, -0.41008333585724776604, -0.65692733363864064255, -0.65039078509618042379, -0.39796354216825385874, -0.00000025088014087016, 0., 0., 0., 0., -0.00000047538379083412, -0.37105893237058412693, -0.36812453062441391483, -0.24868975891368727549, -0.12533335336355946876, -0.00000000000000024493, 0.35296270743746521736, 0.56542282009323718839, 0.5597961672619614637, 0.48175343923447266903, 0.58778512170357111177, 0.68454710419715092407, 0.7705132929382439988, 0.8443280367726911928, 0.90482719487359475341, 0.95105644385979148936, 0.98228719220845672755, 0.99802672411663273522, 0.50652485946691649943, 0.30993430197542637394, -0.00000000000000102355, 0., 0., 0., 0., 0.00000037022373378867, 0.288981702438143917, 0.36812487719620695659, 0.24869012128477269163, 0.12533335336179080022, 0.00000000000000036739, -0.12533335336179080022, -0.24869012128477269163, -0.36812487719620695659, -0.26676374772184308082, -0.00000033633495046675, 0.26148096115523400407, 0.4188754423513013081, 0.41470733687416205804, 0.25375246037653248488, 0.00000063986341405919, -0.24872810631039179996, -0.39844654534179602123, -0.39448193925685731687, -0.24137708410968375383, -0.00000000000000089622, 0., 0., 0., 0., -0.00000028833054035243, -0.22505918589350193404, -0.36052915209076136227, -0.24869012128477269163, -0.12533335336179080022, -0.00000000000000048986]
-sigRan.y[3]=[0., 0.12533323744971558433, 0.24868989533082475063, 0.36812455241538011297, 0.48175368692903930423, 0.0000000445020641171, -0.55355537001409316211, -0.88675921538246205156, -0.87793578713185949081, -0.53719542566424594021, -0.00000008466318798805, 0.52655812664543144574, 0.84351149702457073332, 0., 0., 0., -0.50087770454174007639, -0.80237289892985752537, -0.79438928745491732553, -0.48607428255131474026, -0.00000015321284262126, 0., 0., 0., 0., 0., -0.45321308876825139311, -0.72601687600025088809, -0.71879304950829014942, -0.48175376837626832094, -0.58778512170174834761, -0.6845471041974796611, -0.77051329293908510376, -0.84432783660181121022, -0.90482703867151048627, -0.95105656226047330382, -0.9822871922079218221, -0.9980267241165654557, -0.9980267241165654557, -0.9822871922079218221, -0.95105656226047330382, -0.90482703867151048627, -0.84432783660181121022, -0.77051329293908510376, -0.6845471041974796611, -0.58778512170174834761, -0.48175376837626832094, -0.59441251652989890442, -0.5884978368747760813, -0.36009304579885026421, -0.00000000000000074279, 0.12533335336179080022, 0.24869012128477269163, 0.36812487719620695659, 0.34253143032715055449, 0.00000043186260427486, -0.33574818370815218138, -0.53784668404447388834, -0.53249473778151046321, -0.32582461548302843468, -0.00000082160086994909, 0.31937322911728016628, 0.51161551739209942813, 0., 0., -0.00000077841108238606, -0.30379689057499381644, -0.4866635988941319102, -0.48182144815217253786, -0.29481896321012102113, 0.00000000000000267704, 0., 0., 0., 0., 0., -0.27488765531473713377, -0.44035173465036431262, -0.43596972317358795301, -0.48175343923447266903, -0.58778512170357111177, -0.68454710419715092407, -0.7705132929382439988, -0.8443280367726911928, -0.90482719487359475341, -0.95105644385979148936, -0.98228719220845672755, -0.99802672411663273522, -0.99802672411663273522, -0.98228719220845672755, -0.95105644385979148936, -0.90482719487359475341, -0.8443280367726911928, -0.7705132929382439988, -0.68454710419715092407, -0.58778512170357111177, -0.48175343923447266903, -0.36812487719620695659, -0.35694217642876641117, -0.21840747696428625124, -0.00000000000000090104]
-sigRan.y[1]=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0.9980267241165654557, 0.98228722941836554838, 0.95105656226047341484, 0.90482703867151026422, 0.84432793843630538078, 0.77051329293908510376, 0.6845471041974796611, 0.58778527400645275147, 0.48175360490634872024, 0.76324076860438350156, 0.75564640302484975543, 0.46236802414670519212, 0.00000000000000047688, 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0.39008393283169767729, 0.62488878460857943953, 0.61867101762918241814, 0.37855503689290809222, 0.00000000000000070278, 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0.99802672411663273522, 0.98228719220845672755, 0.95105644385979148936, 0.90482719487359475341, 0.8443280367726911928, 0.7705132929382439988, 0.68454710419715092407, 0.58778512170357111177, 0.48175343923447266903, 0.462928581902849412, 0.45832282660288503617, 0.28044073257217516648, 0.00000000000000254591, 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0.00000060622715434494, 0.23659725164798767194, 0.3790139866974083227, 0.37524293576908973602, 0.22960523748942221478, -0.0000000000000004741, 0., 0., 0., 0., 0.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Validation_LimPIDReset.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Validation_LimPIDReset.txt
deleted file mode 100644
index ae54d375..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Validation_LimPIDReset.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-last-generated=2016-09-30
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "8",
- "linear": " "
-}
-setPoi.y=[0., 0.06279052189025491337, 0.12533323745214697276, 0.18738131638459501471, 0.24868989534003738129, 0.30901699812136379508, 0.36812455243550129547, 0.42577928134743442401, 0.4817536869409441147, 0.5358267832061716085, 0.58778523637911683775, 0.63742399502753377405, 0.6845471385054687774, 0.72896864067193822834, 0.77051323411742123071, 0.80901698037973324151, 0.84432793855642251923, 0.87630664754848952569, 0.90482703892538673962, 0.92977649516155091991, 0.95105653411415636, 0.96858317659314352444, 0.98228722946472835087, 0.99211471927965522166, 0.99802673053509816103, 1., 0.9980267244918734626, 0.99211473075717082626, 0.98228722946472835087, 0.96858315324141708302, 0.95105656270989080703, 0.92977649516155091991, 0.90482703892538673962, 0.87630669226041957298, 0.84432793855642240821, 0.80901698037973335254, 0.77051329337862595192, 0.72896864067193822834, 0.68454710432452448021, 0.6374239225441147294, 0.58778527414713988009, 0.53582678320617171952, 0.48175360468210237652, 0.42577932358903641807, 0.36812453065795114338, 0.30901693120370304912, 0.24868994060828003567, 0.18738130488501614224, 0.12533316773689304191, 0.06279058026677090953, 0.00000000000000012246, -0.06279058026588016372, -0.12533335346552829104, -0.187381488611136654, -0.2486897591159555887, -0.30901693120476697585, -0.36812453065774336514, -0.42577932358843195715, -0.48175376869956793024, -0.53582694082383752754, -0.58778512224712653467, -0.63742392254515201078, -0.68454710432485177396, -0.72896864067163469336, -0.77051329337777874073, -0.80901708986911602395, -0.84432783747032003063, -0.87630660193027931637, -0.9048270389256758417, -0.92977649516163163312, -0.95105656270955252207, -0.96858319930599690029, -0.98228719331560565564, -0.99211470696176862205, -0.99802672449193507997, -1., -0.99802672449193507997, -0.99211470696176862205, -0.98228719331560565564, -0.96858319930599690029, -0.95105656270955252207, -0.92977649516163163312, -0.9048270389256758417, -0.87630660193027931637, -0.84432783747032003063, -0.80901708986911602395, -0.77051329337777874073, -0.72896864067163469336, -0.68454710432485177396, -0.63742392254515201078, -0.58778512224712653467, -0.53582694082383752754, -0.48175376869956793024, -0.42577932358843195715, -0.36812453065774336514, -0.30901693120476697585, -0.2486897591159555887, -0.18738148861113662624, -0.12533335346552829104, -0.06279058026588016372, -0.00000000000000024493]
-mea.y=[0.5, 0.5]
-time=[0., 1.]
-trigger.y=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.00000596036355997443, 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.00001192072717545907, 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-limPIDDef.y=[-6.30000019073486328125, -6.18219423030949855047, -6.06460284662152648849, -5.94747161082389474984, -5.831051339279115453, -5.7155871476996704672, -5.60131548313702420927, -5.48848581648419120427, -5.37734315811839014287, -5.26809362474907771912, -5.16095782909344436007, -5.05617331842939954356, -4.95396372958707154055, -4.85453744045376289762, -4.75809193224951609835, -4.66480260609489771895, -4.574866740273598964, -4.48843099206359585907, -4.40565973373690678017, -4.32668493351108374156, -4.25163652701730931938, -4.18063206948273258234, -4.11379002758276701712, -4.05119993842504833026, -3.99293109769375931251, -3.93902444839477539062, -3.88954801861755150583, -3.84450249543683320042, -3.80391049847903195413, -3.76775524205157807955, -3.73601773975023698782, -3.7086656154641435279, -3.68566297024725164633, -3.6669450029546455383, -3.6524257705908289573, -3.64199327945488970926, -3.63555813533501748225, -3.63297343304679909437, -3.63411045231179885562, -3.63880778326595510919, -3.64690350925162665163, -3.65822554106030839449, -3.67259480682308492305, -3.68981503130893706555, -3.70967579396971247618, -3.73195555644076604196, -3.75643751893859700886, -3.78288340896670449709, -3.81106022142696376775, -3.84072181682887636711, -3.87162446975708007812, -3.90351989972866730838, -3.9361525210564014543, -3.96926698673608102652, -4.00259392258819346466, -4.03588291022980438782, -4.06890010050484729476, -4.10138227846284575406, -4.13306718298398045874, -4.16376169444302846046, -4.1932400967264440439, -4.2212428655338758432, -4.2475318786889388889, -4.2718892207724774579, -4.29411080482936480252, -4.31401638604546278088, -4.33139462953799725398, -4.3460960161740302965, -4.35794638822928170896, -4.36680793929215127491, -4.37254286266264902139, -4.37502431970288530039, -4.37412310300749407332, -4.36974049717700374629, -4.36180020273362334393, -4.35025835037231445312, -4.3350338769735659028, -4.31625123798380005979, -4.29374973823707684062, -4.26752477873528057728, -4.23752359330005745619, -4.20381976012458213887, -4.16647097622117268401, -4.12553589313741841949, -4.08109271251432392802, -4.03325187963907172417, -3.98208911769050111218, -3.92775109081072226758, -3.87035653155216996524, -3.81006327347804463201, -3.74702605102549268778, -3.68141048733968867523, -3.61338507715178858248, -3.54314022379769832938, -3.47088025251020138029, -3.39682427042661450045, -3.32117755689522953233, -3.24417804000779463891, -3.1660496301976426281, -3.08703430110298748801, -3.00737071037292480469]
-limPIDDef.controlError=[-0.5, -0.43720948556032568355, -0.37466677744901089042, -0.3126186687142488152, -0.25131010465996928005, -0.19098301677979737101, -0.13187543266335252645, -0.07422071120198499294, -0.01824631678434077142, 0.03582677575562759342, 0.08778524382969189743, 0.1374239950275293054, 0.18454712360434755158, 0.22896864067190272896, 0.27051323411741240443, 0.30901698037982205935, 0.34432793855642246372, 0.37630667735078532354, 0.40482703892538673962, 0.42977649516158644705, 0.45105650431187838123, 0.46858317659324127957, 0.48228725926701521143, 0.49211468947745717895, 0.49802673053501822498, 0.5, 0.49802672449201551563, 0.49211470095484849407, 0.48228725926701521143, 0.468583153241541428, 0.45105653290756841933, 0.42977649516158644705, 0.40482703892538673962, 0.37630672206274201619, 0.3443279385564223527, 0.30901698037982217038, 0.27051329337862589641, 0.22896864067190272896, 0.18454708942346984002, 0.13742392254390156658, 0.08778528159769832806, 0.03582677575562774608, -0.01824639904315126029, -0.07422066896038301276, -0.1318754544409054541, -0.19098308369745817248, -0.25131005939178213682, -0.31261868021384042748, -0.37466684716418824364, -0.43720942718380967351, -0.5, -0.56279057281529953904, -0.625333368366263187, -0.68738150351165838714, -0.74868975911611546081, -0.80901693120476692034, -0.86812453065774342065, -0.92577932358853853856, -0.981753738897494177, -1.03582694082383741652, -1.08778512224712642364, -1.1374239225451521218, -1.18454704472034921814, -1.22896864067149258481, -1.27051335298199719048, -1.30901703026518179129, -1.34432783746953843362, -1.37630660192978204748, -1.40482697932124422913, -1.42977643555705791201, -1.45105650310490763566, -1.4685831397026309908, -1.48228725291939777975, -1.49211464735826071504, -1.49802672449193496895, -1.5, -1.49802672449193496895, -1.49211464735826071504, -1.48228725291939777975, -1.4685831397026309908, -1.45105650310490763566, -1.42977643555705791201, -1.40482697932124422913, -1.37630660192978204748, -1.34432783746953843362, -1.30901703026518179129, -1.27051335298199719048, -1.22896864067149258481, -1.18454704472034921814, -1.1374239225451521218, -1.08778512224712642364, -1.03582694082383741652, -0.981753738897494177, -0.92577932358853853856, -0.86812453065774342065, -0.80901693120476692034, -0.74868975911611546081, -0.68738150351165838714, -0.625333368366263187, -0.56279057281529953904, -0.5]
-limPIDPar.y_reset=[0.20000000298023223877, 0.20000000298023223877]
-limPIDPar.y=[0.30000001192092895508, 0.31251123575478673144, 0.32497918661326685719, 0.33735439263792765807, 0.34958776940049479665, 0.36163079649541546301, 0.37343591607771980945, 0.38495621051206929675, 0.39614594178888529186, 0.40696107960167954287, 0.4173589333562799375, 0.20993901846683610257, 0.21937968081604566906, 0.22828449717412152564, 0.23661816071885521939, 0.24434773178078664224, 0.25144228578843069721, 0.25787383207801051199, 0.26361670699463329859, 0.2686481486786624906, 0.27294814467339523212, 0.27649948203858920603, 0.27928772596420914365, 0.28130173612140796369, 0.28253331821184973771, 0.28297767043113708496, 0.2826325289551065989, 0.28149932778256964161, 0.27958226230489147124, 0.27688881491612526986, 0.27342942805610248591, 0.19578805673342497551, 0.19083980831014527024, 0.18517459218680815125, 0.17881457744796108722, 0.17178487335451297913, 0.1641127878502201265, 0.15582861412600720885, 0.14696475424942612165, 0.13755610684945171474, 0.12763959772015651128, 0.11725408948094948047, 0.10644028376642741818, 0.09524069792753087071, 0.08369929808937148774, 0.07186154336306548041, 0.05977390232485760985, 0.04748390467283539196, 0.03503984360284265881, 0.02249071084081379068, 0.00988573580980300903, 0.18738875082208472644, 0.17482078667646935854, 0.16234555273691242405, 0.1500122661310271388, 0.13786922342205978897, 0.12596409304113784233, 0.11434376912437814455, 0.10305404305411000609, 0.0921388733662235615, 0.08164110260168927491, 0.0716020754752651617, 0.06206140739654237432, 0.05305657495018924197, 0.04462290517529525491, 0.0367933296787589445, 0.02959882610012912196, 0.02306726688279147133, 0.01722438472457423972, 0.01209291983203524337, 0.00769407505560710126, 0.19634867518913762252, 0.1934604122543846505, 0.19134642527521217303, 0.19001482524128965323, 0.18947048485279083252, 0.18971562454061347003, 0.19074917126696647185, 0.1925666099572000689, 0.19516118738072549266, 0.19852096895829807188, 0.20263291790261631076, 0.20748116453774653745, 0.21304639682754142327, 0.21930641193989222626, 0.22623607291912040118, 0.23380817844135504124, 0.24199235037737001908, 0.25075620846570007005, 0.26006485407747859107, 0.26988055873673816309, 0.21028547225094754158, 0.22099928233043006354, 0.23209889919048029561, 0.24354028978986275167, 0.25527803527724451937, 0.26726573325365204914, 0.27945565650193454621, 0.29179970046294778641, 0.30424888732031513117, 0.31675386428833007812]
-limPIDInp.y_reset_in=[0.89999997615814208984, 0.89999997615814208984]
-limPIDInp.y=[0.30000001192092895508, 0.31251123575478673144, 0.32497918661326685719, 0.33735439263792765807, 0.34958776940049479665, 0.36163079649541546301, 0.37343591607771980945, 0.38495621051206929675, 0.39614594178888529186, 0.40696107960167954287, 0.4173589333562799375, 0.90993899164476377273, 0.91937965399403542843, 0.92828452995660504232, 0.93661814879793070521, 0.94434773476101885326, 0.95144230366982407432, 0.95787382015708155691, 0.96361666527159506312, 0.96864813675773353552, 0.97294813275246627704, 0.97649949991988493903, 0.97928774384560257626, 0.98130172420047900861, 0.98253333609324322584, 0.98297768831253051758, 0.98263251703417764382, 0.98149931586180061416, 0.97958225038396251616, 0.97688883279727001252, 0.97342944593731828284, 0.89578807461478282548, 0.89083981129027089985, 0.88517458026578155206, 0.8788145804281933815, 0.87178486143358402405, 0.86411280573140036854, 0.85582864690845528166, 0.84696477213078402713, 0.83755610982979056267, 0.82763958579922758396, 0.81725406265892597268, 0.8064402792961767874, 0.7952407083582904157, 0.7836992712673435113, 0.77186153889285036289, 0.75977392020608003342, 0.74748390765305872119, 0.73503981678083241125, 0.72249073989795375983, 0.70988571643829345703, 0.88738875380224591094, 0.87482080455772071037, 0.86234554081662295744, 0.85001226911109950546, 0.83786924130336437599, 0.82596409602138787243, 0.81434374230239459092, 0.80305401623208205741, 0.79213884654462185519, 0.78164109068076026432, 0.77160204865349479864, 0.76206142155258338455, 0.75305658165571176532, 0.744622874628074638, 0.73679332148351994736, 0.72959883839304973119, 0.72306729407716197056, 0.71722436349051943427, 0.7120929349194253799, 0.70769406266901968561, 0.89634864836736727334, 0.89346040033324258811, 0.89134639845354834975, 0.89001482822145083773, 0.88947045803070068359, 0.88971561261989773328, 0.89074915934617959756, 0.89256662783816720363, 0.89516120526211895303, 0.89852094213647437648, 0.90263289108054389764, 0.90748113771565641628, 0.91304637000557564708, 0.91930641492051523578, 0.92623607589917500427, 0.93380819632274847386, 0.94199233845644103624, 0.95075619654484222476, 0.96006484215654963599, 0.96988054681616442387, 0.91028544542924816341, 0.92099927040937679124, 0.93209891707182046527, 0.94354027786896932373, 0.95527805315863789648, 0.96726575113440604881, 0.97945567438332792332, 0.99179968854201883133, 1., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Validation_OffTimerNonZeroStart.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Validation_OffTimerNonZeroStart.txt
new file mode 100644
index 00000000..3e009db0
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Continuous_Validation_OffTimerNonZeroStart.txt
@@ -0,0 +1,12 @@
+last-generated=2017-05-12
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+offTim1.y=[0e+00, 1.000000931306589e-02, 2.000001862613177e-02, 3.00000279392243e-02, 3.999997764861795e-02, 4.999998882432899e-02, 5.999999627467867e-02, 7.000000745044743e-02, 8.000001490091246e-02, 9.000002980183387e-02, 9.999997764861346e-02, 9.999985471614289e-03, 1.999999478467351e-02, 3.000000409774384e-02, 4.000001341080529e-02, 5.000002458651632e-02, 5.999997243329146e-02, 6.999998360903359e-02, 7.999999105943645e-02, 9.000000596049107e-02, 1.00000013410823e-01, 1.100000208613059e-01, 1.199999687080944e-01, 1.299999761585684e-01, 1.399999910594454e-01, 1.500000059604645e-01, 1.600000059603224e-01, 1.700000208613415e-01, 1.800000357621474e-01, 1.899999761584619e-01, 1.99999991059481e-01, 9.999997392266868e-03, 2.00000067054027e-02, 3.000001601848412e-02, 4.000002533153447e-02, 4.99999769035998e-02, 5.999998435402053e-02, 6.999999552974046e-02, 8.000000298016119e-02, 9.000001788112699e-02, 1.0000002533153e-01, 1.099999731783983e-01, 1.199999806288012e-01, 1.299999880792309e-01, 1.400000029802677e-01, 1.500000178811269e-01, 1.600000178810737e-01, 1.699999731783362e-01, 1.799999880793552e-01, 1.899999880792131e-01, 2.000000029802322e-01, 1.000000931320799e-02, 1.999998882414911e-02, 2.999999813735821e-02, 4.000000745056509e-02, 4.999998882415135e-02, 5.99999962747142e-02, 7.00000074505539e-02, 7.999998509888762e-02, 8.999999999999997e-02, 1.000000074505584e-01, 1.099999850988921e-01, 1.199999925494372e-01, 1.3e-01, 1.400000149011612e-01, 1.5e-01, 1.6e-01, 1.700000149011612e-01, 1.8e-01, 1.899999999999999e-01, 1.999988228106446e-01, 9.999991431851707e-03, 2.000000074505581e-02, 3.00000100582738e-02, 3.999998956920492e-02, 5.000000074505806e-02, 5.999999329448746e-02, 7.000000447033283e-02, 7.999999701977223e-02, 8.99999970197678e-02, 1.000000044703373e-01, 1.099999970197767e-01, 1.200000044703483e-01, 1.299999970197677e-01, 1.399999970197677e-01, 1.500000119208845e-01, 1.599999970197677e-01, 1.699999970197678e-01, 1.800000044703484e-01, 1.899999970197678e-01, 1.99999855459031e-01, 1.000000335275464e-02, 1.999999776482919e-02, 2.999999962747185e-02, 3.999999776482577e-02, 5.000000149011607e-02, 5.999999776482579e-02, 6.999999962747282e-02, 7.999999776482664e-02, 9.000000335276084e-02, 1.000000014901161e-01]
+offTim1.u=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.960363559974428e-06, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.192072717545907e-05, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.980226188066309e-06, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999940395476239e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.490113121788674e-06, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999992549434391e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+time=[-1e+00, 0e+00]
+offTim2.u=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999940396364401e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999880792728245e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999970197738119e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.960452376132618e-06, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999985098868782e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.45056560894337e-07, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+offTim2.y=[0e+00, 1.000000931306589e-02, 2.000001862613177e-02, 3.00000279392243e-02, 3.999997764861795e-02, 4.999998882432899e-02, 5.999999627467867e-02, 7.000000745044743e-02, 8.000001490091246e-02, 9.000002980183387e-02, 9.999997764861346e-02, 1.099999850991052e-01, 1.199999925495082e-01, 1.29999999999929e-01, 1.40000014900948e-01, 1.500000298017895e-01, 1.599999701982638e-01, 1.699999850990875e-01, 1.800000000001065e-01, 1.900000000000355e-01, 1.999988228282302e-01, 1.000002123379496e-02, 1.999997094321525e-02, 2.99999802562989e-02, 3.999998956934703e-02, 5.000000074505806e-02, 6.000000819547879e-02, 7.00000193711543e-02, 8.000002682166386e-02, 8.999998211892635e-02, 9.999998956936484e-02, 1.099999970197412e-01, 1.200000044702418e-01, 1.300000119206803e-01, 1.400000268216994e-01, 1.499999821189618e-01, 1.599999821189263e-01, 1.699999970198388e-01, 1.800000119208224e-01, 1.900000119207158e-01, 1.999976426762171e-01, 9.999973550890655e-03, 1.999998286394433e-02, 2.999999217701687e-02, 4.000000149014715e-02, 5.000001266578713e-02, 6.000002011620787e-02, 6.99999716883266e-02, 7.999997913872958e-02, 8.999999403967762e-02, 1.000000014901161e-01, 1.100000089406967e-01, 1.199999865889949e-01, 1.299999940395444e-01, 1.400000089406968e-01, 1.499999940395356e-01, 1.599999940395533e-01, 1.700000089406967e-01, 1.799999940395355e-01, 1.899999940395355e-01, 1.999994128954384e-01, 9.999985471401129e-03, 1.999999478460246e-02, 3.000000409781489e-02, 4.000001341101844e-02, 4.999999478460471e-02, 6.000000223516755e-02, 7.000001341099626e-02, 7.999999105932998e-02, 9.000000596045554e-02, 1.000000134110006e-01, 1.099999910593343e-01, 1.199999985098839e-01, 1.300000059604645e-01, 1.399999910593033e-01, 1.500000059604645e-01, 1.599999910593433e-01, 1.700000059604645e-01, 1.800000059604645e-01, 1.899999910593033e-01, 1.999997079378298e-01, 9.999997392302395e-03, 2.000000670550917e-02, 3.000000111758538e-02, 3.999999552965827e-02, 5.000000670551141e-02, 5.999999925494082e-02, 6.99999955296694e-02, 7.999999552966164e-02, 9.000000298023225e-02, 1.000000029802267e-01, 1.100000029802323e-01, 1.199999955296583e-01, 1.299999955296528e-01, 1.399999992549394e-01, 1.500000067055183e-01, 1.599999955296566e-01, 1.700000011175865e-01, 1.800000067055217e-01, 1.899999973922964e-01, 2.000000029802322e-01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Discrete_Examples_BooleanDelay.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Discrete_Examples_BooleanDelay.txt
deleted file mode 100644
index 7aed93e5..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_Discrete_Examples_BooleanDelay.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-last-generated=2017-01-03
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-del.u=[0., 0.00000011175869073926, 1., 1., 1., 1., 0.99999932944785729916, 0., 0., 0., 0., 0.00000029802262019441, 1., 1., 1., 1., 0.9999982118642788409, 0., 0., 0., 0., 0.0000032782488151996, 1., 1., 1., 1., 0.99999523163807690906, 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0.00000178813570728868, 1., 1., 1., 1., 1., 0., 0., 0., 0., 0.00000476829087018363, 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0.00001072865443015806, 1., 1., 1., 1., 0.99999523170912985037, 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 1., 1., 1., 1., 0.99998927134556980789, 0., 0., 0., 0.]
-del.y=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 1., 1., 1., 1., 0.99999701977381194595, 0., 0., 0., 0., 0., 1., 1., 1., 1., 0.99999403954759613633, 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 1., 1., 1., 1., 0.99998807927282451491, 0., 0., 0., 0., 0.00000596036355997443, 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0.00001192072717545907, 1., 1., 1., 1., 0.99999403963644006854, 0., 0., 0., 0., 0.]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_SetPoints_Examples_HotWaterTemperatureReset.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_SetPoints_Examples_HotWaterTemperatureReset.txt
deleted file mode 100644
index 3162e011..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_SetPoints_Examples_HotWaterTemperatureReset.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-heaCur.TRet=[313.149993896484375, 312.78637694499411736615, 312.42272947593255594256, 312.05908200686758391385, 311.69546505538073688513, 311.33181765404469842906, 310.96817011725079282769, 310.60455323349287937162, 310.24090569669908745709, 309.87725843087508792451, 309.51364141160490817128, 309.14999387481117310017, 308.78637685555457892406, 308.42272931880177111452, 308.05908205292320189983, 307.69546530462275768514, 307.3318174969138567576, 306.96817023106257238396, 306.60455348273484332822, 306.24090567502588555726, 305.87725840919279107766, 305.51364111901654041503, 305.14999385313797120034, 304.78637710483752698565, 304.42272929712856921469, 304.05908203125, 303.69546474111916722904, 303.33181801707098657062, 302.9681702093802186937, 302.60455291923125287212, 302.24090619518307221369, 301.87725838751049423081, 301.51364109734328167178, 301.14999437329510101335, 300.7863770831642682424, 300.42272927545536731486, 300.05908255140712981301, 299.69546526127635388548, 299.33181745356739611452, 298.96816964585849518699, 298.60455343938838268514, 298.2409056316794817576, 297.87725782397052398665, 297.51364161750046832822, 297.14999380979151055726, 296.78637651947877884595, 296.42272979561249712788, 296.05908198790359620034, 295.69546469777276342938, 295.33181797372458277096, 294.968170166015625, 294.60455287588996498016, 294.24090506818623680374, 293.8772572604824517839, 293.51364213764600208378, 293.14999432994221706394, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375]
-heaCur.TSup=[333.149993896484375, 332.42272947593255594256, 331.69546505537391567486, 330.96817011725084967111, 330.24090569669897377025, 329.51364141160502185812, 328.78637685557487202459, 328.05908205292786306018, 327.3318174969138567576, 326.60455348273484332822, 325.87725840917005371011, 325.14999385313797120034, 324.42272929712856921469, 323.6954647410464076529, 322.96817020937112374668, 322.24090619518307221369, 321.51364109734328167178, 320.7863770831642682424, 320.05908255151626917723, 319.33181745356739611452, 318.60455343938838268514, 317.87725782397052398665, 317.14999380979151055726, 316.42272979561249712788, 315.69546469769090890622, 314.968170166015625, 314.24090506817589130151, 313.51364213765759814123, 312.78637703981786444274, 312.05908142440000574425, 311.33181849388171258397, 310.60455339604197888548, 309.87725778062412018699, 309.14999485010582702671, 308.42272975226609332822, 307.69546465433535331613, 306.96817120654822019787, 306.24090610849020777096, 305.51364101065041722904, 304.78637591259240480213, 304.05908246480527168387, 303.33181736687453167178, 302.6045522688347091389, 301.87725882104751917723, 301.14999372309864611452, 300.42272862525891241603, 299.69546569474061925575, 298.96817007932276055726, 298.24090498148302685877, 297.51364205096473369849, 296.786376953125, 296.05908133771748680374, 295.33181623988804176406, 294.60455114162209611095, 293.87725986155686541679, 293.14999476340005912789, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375]
-heaCur.TOut=[263.149993896484375, 263.54998780191135665518, 263.9500122249096421001, 264.35000613033315630673, 264.7500000357567842002, 265.14999386668705483316, 265.54998784662438993109, 265.95001219510777445976, 266.35000617502902287015, 266.74999985697314741628, 267.14999383688984835317, 267.54998781681564423707, 267.95001231430137522693, 268.35000629421807616382, 268.74999997616220070995, 269.14999365810626841267, 269.54998793605017226582, 269.9500121354905672888, 270.35000581735278046835, 270.75000009535125400362, 271.14999377729532170633, 271.54998805528470029458, 271.9500122547068485801, 272.35000593658730849711, 272.75000021454025045387, 273.149993896484375, 273.54998817451917147991, 273.95001177778698320253, 274.35000605582183652587, 274.75000033372930374753, 275.14999341972821866875, 275.54998769761749599638, 275.95001249308495516743, 276.35000557888378125426, 276.74999985697314741628, 277.14999413495337421409, 277.54998722086133966513, 277.95001201625603926004, 278.35000629421807616382, 278.75000057210741033487, 279.14999365810632525609, 279.54998793605017226582, 279.95001273146300491135, 280.35000581735278046835, 280.75000009535125400362, 281.1499943734224302716, 281.54998745923944625247, 281.9500122547068485801, 282.35000653259618275115, 282.74999961859509767237, 283.149993896484375, 283.54998817451348713803, 283.95001296982974281491, 284.35000724771333580065, 284.74999914185173111036, 285.14999341973532409611, 285.54998769761607491091, 285.95001249308069191102, 286.35000677096428489676, 286.75000104884793472593, 287.14999294298627319222, 287.54998722086986617796, 287.95001201625888143099, 288.35000629421523399287, 288.75000057209888382204, 289.14999485034627468849, 289.54998674412081527407, 289.95001153932793158674, 290.35000581735704372477, 290.75000009535267508909, 291.14999437341532484425, 291.54998865144443698227, 291.95001106239698174249, 292.35000534042609388052, 292.74999961860078201425, 293.149993896484375, 293.54998817451348713803, 293.95001296982974281491, 294.35000724771333580065, 294.74999914185173111036, 295.14999341973532409611, 295.54998769761607491091, 295.95001249308069191102, 296.35000677096428489676, 296.75000104884793472593, 297.14999294298627319222, 297.54998722086986617796, 297.95001201625888143099, 298.35000629421523399287, 298.75000057209888382204, 299.14999485034627468849, 299.54998674412081527407, 299.95001153932793158674, 300.35000581735704372477, 300.75000009535267508909, 301.14999437341532484425, 301.54998865144443698227, 301.95001106239698174249, 302.35000534042609388052, 302.74999961860078201425, 303.149993896484375]
-time=[0., 1.]
-heaCur1.TRoo_in=[293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375]
-heaCur1.TRet=[313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375]
-heaCur1.TSup=[333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_SetPoints_Examples_OccupancySchedule.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_SetPoints_Examples_OccupancySchedule.txt
deleted file mode 100644
index 09fea34b..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_SetPoints_Examples_OccupancySchedule.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-occSchWee.tNexNonOcc=[154800., 141840., 128880., 115920., 102960., 90000., 77040., 64079.99999999998544808477, 51120., 38160., 25200., 12240., 85680., 72720., 59759.99999999997089616954, 46800., 33840., 20879.99999999997089616954, 7920., 81360., 68400., 55440., 42480., 29520., 16560., 3600., 77040., 64080., 51119.99999999994179233909, 38160., 25200., 12240., 85680., 72720., 59759.99999999994179233909, 46800., 33840., 20880., 7920., 81360., 68400., 55440., 42480., 29520., 16560., 3600., 163440., 150480., 137520., 124560., 111600., 98640., 85680., 72720., 59760., 46800., 33839.99999999988358467817, 20880.00000000011641532183, 7920., 81360., 68400., 55440., 42480., 29520., 16560., 3600., 77040., 64080., 51119.99999999988358467817, 38160.00000000011641532183, 25200., 12240., 85680., 72720., 59760., 46800., 33840., 20880., 7920., 81360., 68400., 55440., 42480., 29520., 16560., 3600., 77040., 64080., 51120., 38160., 25200., 12240., 172080., 159120., 146160., 133200., 120240., 107280., 94320., 81360., 68400.]
-occSchDay.tNexNonOcc=[68400., 55440., 42480., 29520., 16560., 3600., 77040., 64079.99999999998544808477, 51120., 38160., 25200., 12240., 85680., 72720., 59759.99999999997089616954, 46800., 33840., 20879.99999999997089616954, 7920., 81360., 68400., 55440., 42480., 29520., 16560., 3600., 77040., 64080., 51119.99999999994179233909, 38160., 25200., 12240., 85680., 72720., 59759.99999999994179233909, 46800., 33840., 20880., 7920., 81360., 68400., 55440., 42480., 29520., 16560., 3600., 77040., 64080., 51120., 38160., 25200., 12240., 85680., 72720., 59760., 46800., 33839.99999999988358467817, 20880.00000000011641532183, 7920., 81360., 68400., 55440., 42480., 29520., 16560., 3600., 77040., 64080., 51119.99999999988358467817, 38160.00000000011641532183, 25200., 12240., 85680., 72720., 59760., 46800., 33840., 20880., 7920., 81360., 68400., 55440., 42480., 29520., 16560., 3600., 77040., 64080., 51120., 38160., 25200., 12240., 85680., 72720., 59760., 46800., 33840., 20880., 7920., 81360., 68400.]
-time=[-86400., 1209600.]
-occSchWee.occupied=[0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 0., 0., 0., 0., 1., 1., 1., 0., 0., 0., 1., 1., 1., 1., 0., 0., 0., 1., 1., 1., 0., 0., 0., 0., 1., 1., 1., 0., 0., 0., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 0., 0., 0., 1., 1., 1., 1., 0., 0., 0., 1., 1., 1., 0., 0., 0., 0., 1., 1., 1., 0., 0., 0., 1., 1., 1., 1., 0., 0., 0., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
-occSchDay.occupied=[0., 0., 1., 1., 1., 1., 0., 0., 0., 1., 1., 1., 0., 0., 0., 0., 1., 1., 1., 0., 0., 0., 1., 1., 1., 1., 0., 0., 0., 1., 1., 1., 0., 0., 0., 0., 1., 1., 1., 0., 0., 0., 1., 1., 1., 1., 0., 0., 0., 1., 1., 1., 0., 0., 0., 0., 1., 1., 1., 0., 0., 0., 1., 1., 1., 1., 0., 0., 0., 1., 1., 1., 0., 0., 0., 0., 1., 1., 1., 0., 0., 0., 1., 1., 1., 1., 0., 0., 0., 1., 1., 1., 0., 0., 0., 0., 1., 1., 1., 0., 0.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_SetPoints_Examples_Table.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_SetPoints_Examples_Table.txt
deleted file mode 100644
index 2e032871..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Controls_SetPoints_Examples_Table.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-tabLinExt.y=[-1.25, -1.21249997531995945543, -1.17499995063991868882, -1.13750004516912994745, -1.10000002048910028307, -1.06250000279398681968, -1.02499997112904583929, -0.98750001303851686618, -0.9499999813735560128, -0.91250003725286299439, -0.87500000558792923044, -0.83749997392297459431, -0.80000000186267516966, -0.76249999813736235588, -0.72500002607703373236, -0.68750002235167517739, -0.64999996274713700561, -0.61250001862643144168, -0.5750000149010813244, -0.53750001490111676272, -0.5000000111758375887, -0.46249998137362180461, -0.42500000745057614493, -0.38749999068674062519, -0.34999997392302789612, -0.3125, -0.27499997019771310613, -0.23750004470340357887, -0.20000000745057161522, -0.16249996274719033518, -0.12500004470335041029, -0.08750000745056284168, -0.04999997392302117649, -0.01249999301504441107, 0.02499998696151069233, 0.06250002235169729858, 0.09999994784604235298, 0.13749998509885655307, 0.17500001490114344693, 0.21249999627469753904, 0.24999997764830270142, 0.28750000745054055118, 0.32500003725295179002, 0.3624999850988121497, 0.4000000149011345707, 0.43749998882407920009, 0.47499996274719036293, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.52500010430803101258, 0.59999997019773121387, 0.67500002980253515084, 0.75000008940670037649, 0.82500014900873397394, 0.89999976158525751835, 0.97499988079269983565, 1.04999988079198924851, 1.125, 1.20000011920801075149, 1.27499989569211158447, 1.35000023841793992396, 1.42500007450586840818, 1.49999991059329973453, 1.57499997019739379489, 1.65000002980216220472, 1.72499992549448677437, 1.80000014900965776832, 1.87499982118926289409, 1.9499999403964209943, 2.02500005960499995794, 2.09999994039500004206, 2.17500005960357922774, 2.25000017881340141912, 2.32499995529643666003, 2.39999997019705624268, 2.47500019371458979123, 2.54999997019762414396, 2.62499986588888267747, 2.70000020861209977241, 2.77499988079284198861, 2.84999976158511536539, 2.9249998807925576827, 3.]
-tabConExt.y=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.02499998696151069233, 0.06250002235169729858, 0.09999994784604235298, 0.13749998509885655307, 0.17500001490114344693, 0.21249999627469753904, 0.24999997764830270142, 0.28750000745054055118, 0.32500003725295179002, 0.3624999850988121497, 0.4000000149011345707, 0.43749998882407920009, 0.47499996274719036293, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.52500010430803101258, 0.59999997019773121387, 0.67500002980253515084, 0.75000008940670037649, 0.82500014900873397394, 0.89999976158525751835, 0.97499988079269983565, 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_BaseClasses_Examples_EqualPercentageDerivativeCheck.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_BaseClasses_Examples_EqualPercentageDerivativeCheck.txt
deleted file mode 100644
index db792af5..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_BaseClasses_Examples_EqualPercentageDerivativeCheck.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'number of continuous time states': '1', 'linear': ' '}
-y=[0.00100000004749745131, 0.01842354629364198124, 0.02162615772409517273, 0.02248911192976044485, 0.02338655859996545405, 0.02431990944235735627, 0.02529051168176253001, 0.02629974295124143727, 0.02734911647276089264, 0.02844031674266736184, 0.02957499755136390462, 0.03075493506836209784, 0.03198196400120310867, 0.03325793581901288765, 0.03458481646491912143, 0.03596463715940281802, 0.03739952348549806932, 0.03889165791590986493, 0.04044332987591976042, 0.04205691481275328908, 0.04373484799138319806, 0.045479723492168736, 0.04729422949045457986, 0.0491811029067377864, 0.05114324498640802213, 0.05318370088934898376, 0.05530554263311706492, 0.05751200152389123604, 0.05980654405587028377, 0.0621926134345403836, 0.06467382309409584751, 0.06725410309533812192, 0.06993729817633066725, 0.07272747532438071649, 0.0756290097425788288, 0.07864628171247627086, 0.08178387871475080451, 0.08504665484952377008, 0.08843959288514488537, 0.09196787099148925893, 0.09563690201839143701, 0.09945232560841059388, 0.103419964871122122, 0.10754588691657293587, 0.11183644935898372219, 0.1162981966941597084, 0.12093793207545021351, 0.12576279103030310602, 0.13078018083879552891, 0.13599773736046530392, 0.14142346382141113281, 0.14706561520163233259, 0.15293289376484658915, 0.15903428493725918491, 0.16537904846689560623, 0.1719769308550527509, 0.17883799803996322519, 0.18597284481788670107, 0.19339230434071408293, 0.20110771641207597638, 0.20913081908444500212, 0.21747415045600518302, 0.22615029987704823866, 0.23517255925455421428, 0.24455472710748629717, 0.25431128737326441636, 0.26445701996002235479, 0.27500758766818916845, 0.28597902454581713982, 0.29738825838081367481, 0.30925269382629849702, 0.32159042088208472654, 0.33442025628673954785, 0.34776211180460997463, 0.36163626757451095006, 0.37606388330459594727, 0.39106701289021195134, 0.40666881269663285314, 0.42289306504704032852, 0.43976443309202017939, 0.45730889699494964296, 0.4755534783526727538, 0.49452589351277176366, 0.51425514015549600444, 0.53477155709774681913, 0.55610639650870352657, 0.5782925164208222446, 0.60136370733586819171, 0.62535543420762074174, 0.65030435400857533601, 0.6762485541300489178, 0.7032275673324563936, 0.73128325951783290648, 0.76045826938187499611, 0.79079712177698546771, 0.82234636818877693276, 0.85515434795881828389, 0.88927098135357718345, 0.92474882882200215573, 0.96164205076960573848, 1.00000691413879394531]
-x=[0.00100000004749745131, 0.01842486690904029598, 0.02162765342814001318, 0.02249049960039225041, 0.02338776931928331082, 0.02432083517702497352, 0.02529112821727195343, 0.0263001303814394162, 0.02734938655628754711, 0.02844050486984408752, 0.02957515215091822969, 0.03075506917881117713, 0.03198205713345057821, 0.03325799914892131615, 0.03458484254195121066, 0.03596462225827493087, 0.03739944897966545473, 0.03889151635488851538, 0.04044311380913574033, 0.0420566130642213501, 0.04373448291295060214, 0.04547929508372335061, 0.04729371167509421187, 0.049180518036176471, 0.05114260051113642819, 0.05318295955657958984, 0.05530472306919811259, 0.05751112608081098559, 0.05980556430453289052, 0.06219154055087225408, 0.06467269805651452985, 0.06725285139782448407, 0.06993594217058209106, 0.07272605971416500059, 0.07562750472533821822, 0.07864470963994811548, 0.08178226938939515966, 0.08504502317237304376, 0.08843793885625236828, 0.09196621696259674184, 0.09563524798949891992, 0.09945066412895080254, 0.1034183033916978578, 0.10754422543709982185, 0.1118347580771793387, 0.11629646815941681315, 0.12093615883733031813, 0.12576097308863745661, 0.13077827349008278035, 0.13599572570384624304, 0.14142136275768280029, 0.14706343963202697656, 0.15293061388689971336, 0.15903185604777142492, 0.16537648546749000866, 0.17197427844844906386, 0.17883527112750027821, 0.18597001359720657931, 0.19338938371299574381, 0.20110475108099840069, 0.20912789845685100798, 0.21747115532281838246, 0.22614728984248708143, 0.2351695641211542509, 0.24455177667756991533, 0.25430830714102564682, 0.26445400992507039906, 0.27500454783130562353, 0.28597598470914675772, 0.29738515893924982736, 0.30924950497762537793, 0.32158717242894446775, 0.33441700783359928906, 0.34775874414246438215, 0.36163278070279158971, 0.37606030702590942383, 0.39106343661138331935, 0.40666511720837256183, 0.42288925034934837788, 0.43976055878979003477, 0.45730502269303924257, 0.47554945503922146921, 0.4945217807921756803, 0.51425096782986434718, 0.5347673251679677664, 0.5561019857657006904, 0.57828798646824564056, 0.60135911777822048663, 0.62535066583603871049, 0.6502993472184142032, 0.67624342812988769147, 0.70322232212371615923, 0.73127777589101095046, 0.76045248773154494604, 0.79079116131250792865, 0.82234016930572029214, 0.85514791065654305324, 0.8892643056333623397, 0.92474197428842141999, 0.96163507702616701778, 1.]
-time=[0., 1.]
-der(y)=[1.97979104518890380859, 1.03077538543183755415, 0.08460787698579638749, 0.0879833477072331227, 0.09149348767935955307, 0.0951436680773258131, 0.09893947146790685321, 0.1028867139217484461, 0.1069914333585380295, 0.11125990593355131186, 0.11569867960982230248, 0.12031453876049212626, 0.12511454654406017895, 0.13010604923236218644, 0.13529670207070296217, 0.14069442124217829138, 0.14630750027156774751, 0.15214450551355390706, 0.15821438586817221372, 0.16452643429316937684, 0.17109030286461426873, 0.17791603963743576888, 0.18501408484770823226, 0.19239531144619462233, 0.20007102612958183041, 0.2080529630184173584, 0.21635335004036229667, 0.22498484505370572317, 0.23396074663199373234, 0.2432947387558657415, 0.25300108211173261141, 0.26309469097801990722, 0.27359098964565342627, 0.28450603819459735488, 0.29585656111400510104, 0.30765990142993931977, 0.31993414168305694956, 0.3326980707815022642, 0.34597123317127054243, 0.3597739540999657093, 0.37412728990386756589, 0.38905329058633553174, 0.40457480249164529118, 0.420715469316798929, 0.43750015310816675607, 0.45495443685984277016, 0.47310505759110477175, 0.49197983972094644356, 0.51160760889460621392, 0.53201846291385124221, 0.55324357748031616211, 0.57531555661606625929, 0.59826807688856742384, 0.62213630514055373588, 0.64695662811050802521, 0.67276730988530508704, 0.69960772341195998081, 0.72751893656627897311, 0.75654368590896470259, 0.7867264365833714912, 0.81811313181089717617, 0.85075218703568800116, 0.88469342733676481494, 0.91998870903531548837, 0.95669215331889712051, 0.99485990779727795363, 1.03455020345481263355, 1.07582407153812709133, 1.11874469976847246144, 1.1633776535250015538, 1.2097912401102137725, 1.25805650822286030355, 1.30824706274492141844, 1.36044027230707964549, 1.41471571433371856585, 1.47115659713745117188, 1.52984922893682195877, 1.59088337417281966424, 1.65435249320470623147, 1.72035334030836906116, 1.78898779188249101857, 1.86036048591254221662, 1.93458049963242095792, 2.01176155878481077721, 2.09202191919336133452, 2.1754837399199793424, 2.26227604653124414469, 2.35253067413731375979, 2.44638614467500925542, 2.54398598658084651447, 2.64547968839714453537, 2.75102205772524976979, 2.86077552310743010722, 2.97490755372778625798, 3.09359314954244535301, 3.21701374809959705914, 3.34535817681501379539, 3.47882232029266402762, 3.6176118546154647504, 3.761938432129320109, 3.91202306747436523438]
-der(x)=[1.97979104518890380859, 1.03077538543183755415, 0.08460787698579638749, 0.0879833477072331227, 0.09149348767935955307, 0.0951436680773258131, 0.09893947146790685321, 0.1028867139217484461, 0.1069914333585380295, 0.11125990593355131186, 0.11569867960982230248, 0.12031453876049212626, 0.12511454654406017895, 0.13010604923236218644, 0.13529670207070296217, 0.14069442124217829138, 0.14630750027156774751, 0.15214450551355390706, 0.15821438586817221372, 0.16452643429316937684, 0.17109030286461426873, 0.17791603963743576888, 0.18501408484770823226, 0.19239531144619462233, 0.20007102612958183041, 0.2080529630184173584, 0.21635335004036229667, 0.22498484505370572317, 0.23396074663199373234, 0.2432947387558657415, 0.25300108211173261141, 0.26309469097801990722, 0.27359098964565342627, 0.28450603819459735488, 0.29585656111400510104, 0.30765990142993931977, 0.31993414168305694956, 0.3326980707815022642, 0.34597123317127054243, 0.3597739540999657093, 0.37412728990386756589, 0.38905329058633553174, 0.40457480249164529118, 0.420715469316798929, 0.43750015310816675607, 0.45495443685984277016, 0.47310505759110477175, 0.49197983972094644356, 0.51160760889460621392, 0.53201846291385124221, 0.55324357748031616211, 0.57531555661606625929, 0.59826807688856742384, 0.62213630514055373588, 0.64695662811050802521, 0.67276730988530508704, 0.69960772341195998081, 0.72751893656627897311, 0.75654368590896470259, 0.7867264365833714912, 0.81811313181089717617, 0.85075218703568800116, 0.88469342733676481494, 0.91998870903531548837, 0.95669215331889712051, 0.99485990779727795363, 1.03455020345481263355, 1.07582407153812709133, 1.11874469976847246144, 1.1633776535250015538, 1.2097912401102137725, 1.25805650822286030355, 1.30824706274492141844, 1.36044027230707964549, 1.41471571433371856585, 1.47115659713745117188, 1.52984922893682195877, 1.59088337417281966424, 1.65435249320470623147, 1.72035334030836906116, 1.78898779188249101857, 1.86036048591254221662, 1.93458049963242095792, 2.01176155878481077721, 2.09202191919336133452, 2.1754837399199793424, 2.26227604653124414469, 2.35253067413731375979, 2.44638614467500925542, 2.54398598658084651447, 2.64547968839714453537, 2.75102205772524976979, 2.86077552310743010722, 2.97490755372778625798, 3.09359314954244535301, 3.21701374809959705914, 3.34535817681501379539, 3.47882232029266402762, 3.6176118546154647504, 3.761938432129320109, 3.91202306747436523438]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Dampers_Examples_Damper.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Dampers_Examples_Damper.txt
deleted file mode 100644
index 7fc6272b..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Dampers_Examples_Damper.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-last-generated=2017-05-02
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "0, 1",
- "linear": " "
-}
-preIndDpFixed_nominal.m_flow=[1.009983103722334e-02, 1.009983103722334e-02, 1.009983103722334e-02, 1.009983103722334e-02, 1.009983103722334e-02, 1.009983103722334e-02, 1.009983103722334e-02, 1.009983103722334e-02, 1.009983103722334e-02, 1.009983103722334e-02, 1.009983103722334e-02, 1.009983103722334e-02, 1.009983103722334e-02, 1.009983103722334e-02, 1.009983103722334e-02, 1.009983103722334e-02, 1.009983103722334e-02, 1.009983103722334e-02, 1.009983103722334e-02, 1.009983103722334e-02, 1.009983103722334e-02, 4.337220957607109e-02, 7.663628110355432e-02, 1.098841811611019e-01, 1.431087433617447e-01, 1.763036847114563e-01, 2.094642984994905e-01, 2.425873371400026e-01, 2.75671954981168e-01, 3.087193943483806e-01, 3.417326414586356e-01, 3.747126381476721e-01, 4.076593157719962e-01, 4.405725464941264e-01, 4.734525861024811e-01, 5.06299276844618e-01, 5.391125209811589e-01, 5.718926035086188e-01, 6.046393073684978e-01, 6.373526921654408e-01, 6.70032660563852e-01, 7.026794073438485e-01, 7.352927754551984e-01, 7.678727870702363e-01, 8.00419517165848e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01, 8.164966106414795e-01]
-preInd.m_flow=[1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 4.339148051618207e-02, 7.667752007011593e-02, 1.09952778644099e-01, 1.432125001689999e-01, 1.764524579048157e-01, 2.096695471545969e-01, 2.428615482287555e-01, 2.760279735140553e-01, 3.091696181169973e-01, 3.422883950354265e-01, 3.753850977211446e-01, 4.084595380265644e-01, 4.415116770892337e-01, 4.745417119189304e-01, 5.075495439734352e-01, 5.405349855759131e-01, 5.734983525494818e-01, 6.064395465505721e-01, 6.393584483703206e-01, 6.722550792171418e-01, 7.051295755605099e-01, 7.379818989309024e-01, 7.708118323176385e-01, 8.036196906076453e-01, 8.364053163195341e-01, 8.691686118505815e-01, 9.019098320874752e-01, 9.346288197455052e-01, 9.673254774210768e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01, 9.981625080108643e-01]
-res.m_flow=[7.812499825377017e-05, 7.812499825377017e-05, 7.812499825377017e-05, 7.812499825377017e-05, 7.812499825377017e-05, 7.812499825377017e-05, 7.812499825377017e-05, 7.812499825377017e-05, 7.812499825377017e-05, 7.812499825377017e-05, 7.812499825377017e-05, 7.812499825377017e-05, 7.812499825377017e-05, 7.812499825377017e-05, 7.812499825377017e-05, 7.812499825377017e-05, 7.812499825377017e-05, 7.812499825377017e-05, 7.812499825377017e-05, 7.812499825377017e-05, 7.812499825377017e-05, 8.875757821368926e-04, 6.301530737353087e-03, 2.791672916836745e-02, 7.652077253670826e-02, 1.291267275810242e-01, 1.709038911168173e-01, 2.198634794807543e-01, 2.702429534227071e-01, 3.179711826017728e-01, 3.722108212597391e-01, 4.357029038540048e-01, 5.100255000168329e-01, 5.970258691043756e-01, 6.988671034493599e-01, 8.180805032837931e-01, 9.576289914005297e-01, 1.120982206438723e+00, 1.312200407963043e+00, 1.534253581735118e+00, 1.785047732242381e+00, 2.066010582369993e+00, 2.378729540836784e+00, 2.724502544940671e+00, 3.104269123178574e+00, 3.518530648952181e+00, 3.967281194071931e+00, 4.449944079224499e+00, 4.965305424673633e+00, 5.511465494246008e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00, 6.085806369781494e+00]
-preIndFrom_dp.m_flow=[1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 1.009988784790039e-02, 4.339148051618207e-02, 7.667752007011593e-02, 1.09952778644099e-01, 1.432125001689999e-01, 1.764524579048157e-01, 2.096695471545969e-01, 2.428615482287555e-01, 2.760279735140553e-01, 3.091696181169973e-01, 3.422883950354265e-01, 3.753850977211446e-01, 4.084595380265644e-01, 4.415111704520979e-01, 4.745320857742881e-01, 5.075115757887786e-01, 5.404417044036153e-01, 5.733162604090045e-01, 6.061288274633195e-01, 6.388727298254556e-01, 6.715404196767421e-01, 7.04122972199959e-01, 7.366090842061003e-01, 7.689840562394508e-01, 8.012286501299983e-01, 8.333151721658051e-01, 8.652026387975452e-01, 8.968252577088046e-01, 9.280624125259218e-01, 9.586454341904315e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01, 9.876275062561035e-01]
-time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Dampers_Examples_MixingBox.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Dampers_Examples_MixingBox.txt
deleted file mode 100644
index eafb1fac..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Dampers_Examples_MixingBox.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-last-generated=2017-05-01
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "2",
- "linear": " "
-}
-mixBox.damExh.m_flow=[4.966588020324707e-01, 4.916372898056545e-01, 4.791267527835951e-01, 4.51642301478998e-01, 4.04309847579612e-01, 3.45075249671936e-01, 2.858613934337675e-01, 2.24553356739622e-01, 1.666751970303924e-01, 1.405454748547256e-01, 1.263915300369263e-01, 1.142150221015406e-01, 1.013744926575643e-01, 7.636261105206892e-02, 5.081325112566615e-02, 3.171778097748756e-02, 1.940741281963836e-02, 1.16694522460353e-02, 6.860347718193686e-03, 4.202190069357385e-03, 2.691688016057014e-03, 1.803984506326458e-03, 1.263192493323099e-03, 9.217395303509372e-04, 6.986493883248289e-04, 5.48163487110287e-04, 9.562169780205272e-04, 4.857608318480771e-03, 3.176244630713326e-02, 1.259878093687761e-01, 2.121203243732452e-01, 2.872603680724079e-01, 3.60942503043448e-01, 4.434030839206589e-01, 5.28020791910624e-01, 6.06845498085022e-01, 6.737111417752497e-01, 7.261234524732627e-01, 7.649069831074398e-01, 7.92297555843806e-01, 8.109610676765442e-01, 8.237747480046396e-01, 8.327123424385952e-01, 8.390666908618331e-01, 8.436759138558254e-01, 8.470855951309204e-01, 8.496552691156114e-01, 8.516252614357963e-01, 8.531591909094492e-01, 8.543703562768268e-01, 8.553386926651001e-01, 8.561215992166386e-01, 8.567607395302025e-01, 8.572871094950145e-01, 8.577239503082267e-01, 8.580888509750366e-01, 8.583954579710877e-01, 8.58654498745861e-01, 8.58874202028121e-01, 8.590613599127918e-01, 8.59221339225769e-01, 8.593584302263104e-01, 8.594762085458557e-01, 8.595775963058269e-01, 8.596650955969428e-01, 8.597407341003418e-01, 8.598061801526421e-01, 8.598628639492739e-01, 8.599119783020044e-01, 8.599545954634801e-01, 8.599916696548462e-01, 8.600237966334118e-01, 8.600517511034314e-01, 8.600760698602701e-01, 8.600972294299645e-01, 8.60115647315979e-01, 8.601316213979157e-01, 8.601455092263373e-01, 8.601576686045671e-01, 8.601681589830156e-01, 8.601773381233215e-01, 8.601853251646688e-01, 8.601922392761783e-01, 8.601983189651038e-01, 8.602035641541385e-01, 8.602080941200256e-01, 8.602120876403203e-01, 8.60215544696454e-01, 8.602185249362719e-01, 8.602211475311683e-01, 8.602234125137329e-01, 8.602253794715579e-01, 8.602270483951694e-01, 8.602285385150784e-01, 8.602298498123371e-01, 8.602309226989746e-01, 8.602319359802095e-01, 8.602327704418258e-01, 8.602334856994579e-01, 8.602341413482767e-01, 8.602346777915955e-01]
-mixBox.damRec.m_flow=[7.812239346094429e-05, 1.024567387344577e-01, 2.830937969977261e-01, 4.422394167878796e-01, 6.001705886544507e-01, 7.284407019615173e-01, 8.223883035781385e-01, 8.901461542276771e-01, 9.4152234495206e-01, 9.836948451103482e-01, 1.020431160926819e+00, 1.053729181570991e+00, 1.084692249257206e+00, 1.113962641175542e+00, 1.141934769829837e+00, 1.168863654136658e+00, 1.194922550046879e+00, 1.212180257117363e+00, 1.212965488207032e+00, 1.213590264667874e+00, 1.214092969894409e+00, 1.214501142262711e+00, 1.214835167025512e+00, 1.215110421099628e+00, 1.215338349471948e+00, 1.215528130531311e+00, 1.215079188935378e+00, 1.213414075777999e+00, 1.210235470936104e+00, 1.204792137252482e+00, 1.195724487304688e+00, 1.180788647658418e+00, 1.156566656711872e+00, 1.118454275202848e+00, 1.061884002537376e+00, 9.874242544174194e-01, 8.991026273374766e-01, 8.03876045322244e-01, 7.094529901281842e-01, 6.21830530575327e-01, 5.443134903907776e-01, 4.778761960208053e-01, 4.220224384545125e-01, 3.755544791038394e-01, 3.370706220948526e-01, 3.052213788032532e-01, 2.774037014344798e-01, 2.349408461534948e-01, 1.780324132827305e-01, 1.22713527461261e-01, 7.981908321380615e-02, 5.061515107303248e-02, 3.199476828909222e-02, 2.044625982421906e-02, 1.33251472343543e-02, 8.902839384973049e-03, 6.115741774545675e-03, 4.32509001732344e-03, 3.149419090052054e-03, 2.359825967199346e-03, 1.817328971810639e-03, 1.436244024728394e-03, 1.162822430207424e-03, 9.627014722884971e-04, 8.135023993981515e-04, 7.003577775321901e-04, 6.132179249698086e-04, 5.451563831961461e-04, 4.913195720318061e-04, 4.482502538133057e-04, 4.134425544179976e-04, 3.850585141008885e-04, 3.61726064666764e-04, 3.424103850672052e-04, 3.263206543327818e-04, 3.128438838757575e-04, 3.015022697415381e-04, 2.919170479129721e-04, 2.837866101775738e-04, 2.768683936019997e-04, 2.709649270400405e-04, 2.659156335945797e-04, 2.615877071421763e-04, 2.578715750672538e-04, 2.546759282337041e-04, 2.519240952096879e-04, 2.495520110959405e-04, 2.475051466678846e-04, 2.457375210160689e-04, 2.442100704009015e-04, 2.428893349133432e-04, 2.417472979467426e-04, 2.407597506149489e-04, 2.399058566033567e-04, 2.391675679485766e-04, 2.385287516517565e-04, 2.379746716321056e-04, 2.374942856766404e-04, 2.370793804113197e-04, 2.367196584144847e-04, 2.36406660405919e-04]
-mixBox.damOA.m_flow=[4.966588020324707e-01, 5.474640708857171e-01, 5.828828194013246e-01, 5.923233618607024e-01, 5.660337868817115e-01, 5.118293166160583e-01, 4.468329446463469e-01, 3.854183972983915e-01, 3.338313252904869e-01, 2.85058804108225e-01, 2.375428080558777e-01, 1.946427463646846e-01, 1.559271959684055e-01, 1.066237248304372e-01, 6.436065688215328e-02, 3.656993433833122e-02, 2.049877545519152e-02, 1.16694522460353e-02, 6.860347718193686e-03, 4.202190069357385e-03, 2.691688016057014e-03, 1.803984506326458e-03, 1.263192493323099e-03, 9.217395303509372e-04, 6.986493883248289e-04, 5.48163487110287e-04, 9.562169780205272e-04, 4.857608318480771e-03, 3.176244630713326e-02, 1.259878093687761e-01, 2.121203243732452e-01, 2.872603680724079e-01, 3.60942503043448e-01, 4.434030839206589e-01, 5.28020791910624e-01, 6.06845498085022e-01, 6.737111417752497e-01, 7.261234524732627e-01, 7.649069831074398e-01, 7.92297555843806e-01, 8.109610676765442e-01, 8.237747480046396e-01, 8.327123424385952e-01, 8.390666908618331e-01, 8.436759138558254e-01, 8.470855951309204e-01, 8.496552691156114e-01, 8.516252614357963e-01, 8.531591909094492e-01, 8.543703562768268e-01, 8.553386926651001e-01, 8.561215992166386e-01, 8.567607395302025e-01, 8.572871094950145e-01, 8.577239503082267e-01, 8.580888509750366e-01, 8.583954579710877e-01, 8.58654498745861e-01, 8.58874202028121e-01, 8.590613599127918e-01, 8.59221339225769e-01, 8.593584302263104e-01, 8.594762085458557e-01, 8.595775963058269e-01, 8.596650955969428e-01, 8.597407341003418e-01, 8.598061801526421e-01, 8.598628639492739e-01, 8.599119783020044e-01, 8.599545954634801e-01, 8.599916696548462e-01, 8.600237966334118e-01, 8.600517511034314e-01, 8.600760698602701e-01, 8.600972294299645e-01, 8.60115647315979e-01, 8.601316213979157e-01, 8.601455092263373e-01, 8.601576686045671e-01, 8.601681589830156e-01, 8.601773381233215e-01, 8.601853251646688e-01, 8.601922392761783e-01, 8.601983189651038e-01, 8.602035641541385e-01, 8.602080941200256e-01, 8.602120876403203e-01, 8.60215544696454e-01, 8.602185249362719e-01, 8.602211475311683e-01, 8.602234125137329e-01, 8.602253794715579e-01, 8.602270483951694e-01, 8.602285385150784e-01, 8.602298498123371e-01, 8.602309226989746e-01, 8.602319359802095e-01, 8.602327704418258e-01, 8.602334856994579e-01, 8.602341413482767e-01, 8.602346777915955e-01]
-time=[0e+00, 2.4e+02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Dampers_Examples_VAVBoxExponential.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Dampers_Examples_VAVBoxExponential.txt
deleted file mode 100644
index 01de376f..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Dampers_Examples_VAVBoxExponential.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-last-generated=2017-05-01
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 0",
- "number of continuous time states": "4",
- "linear": " "
-}
-vav.m_flow=[2e+00, 1.918332580051682e+00, 1.833030230750684e+00, 1.743559591591018e+00, 1.649242297244033e+00, 1.549193382263184e+00, 1.442220550885698e+00, 1.326649865557142e+00, 1.200000089608263e+00, 1.058300518844233e+00, 8.944271802902222e-01, 6.928202725730367e-01, 3.469959246805281e-01, -3.469959246805281e-01, -6.928204528265858e-01, -8.944271802902222e-01, -1.058300397613417e+00, -1.20000008960843e+00, -1.326649865556988e+00, -1.442220638655692e+00, -1.549193382263184e+00, -1.649242219866947e+00, -1.743559627942459e+00, -1.833030195965281e+00, -1.918332629550918e+00, -2e+00, -1.996448997696358e+00, -1.98577572668943e+00, -1.966208424322993e+00, -1.933789464508626e+00, -1.882211446762085e+00, -1.803117333894351e+00, -1.688139724155815e+00, -1.533596887257674e+00, -1.34663295226418e+00, -1.152010917663574e+00, -9.700031789205782e-01, -8.113848661480181e-01, -6.793310352127018e-01, -5.718721112886253e-01, -4.703934490680695e-01, -3.738012295915435e-01, -2.939794683626004e-01, -2.32540273603286e-01, -1.864657008144859e-01, -1.520660221576691e-01, -1.257553113080033e-01, -9.589638045619427e-02, -6.66334672412064e-02, -4.363373226914768e-02, -2.765933237969875e-02, -1.732291822531097e-02, -1.088118290003891e-02, -6.92831586785706e-03, -4.504255393711939e-03, -3.003797261044383e-03, -2.060271146014709e-03, -1.45511568093351e-03, -1.058357491079612e-03, -7.922110910132124e-04, -6.095398566685617e-04, -4.813362872024784e-04, -3.894258557849276e-04, -3.222036045534424e-04, -2.721181632592235e-04, -2.341585059184581e-04, -2.049380508587655e-04, -1.821256854910977e-04, -1.640882201419554e-04, -1.496630910980304e-04, -1.38008821522817e-04, -1.285077382352969e-04, -1.20699698614463e-04, -1.142373511561206e-04, -1.088555636556644e-04, -1.043491865857504e-04, -1.005577127528164e-04, -9.735367001459071e-05, -9.463647125560827e-05, -9.232443522635381e-05, -9.035180119099095e-05, -8.866448816091356e-05, -8.721838266850489e-05, -8.597670095311293e-05, -8.490901637630814e-05, -8.398968930123374e-05, -8.319724836318485e-05, -8.251351473585085e-05, -8.192306926915138e-05, -8.141283737593979e-05, -8.09716439107433e-05, -8.058998994068811e-05, -8.025969185427104e-05, -7.99737823704912e-05, -7.972620428787149e-05, -7.951181760290638e-05, -7.932611290383502e-05, -7.916526393473831e-05, -7.902589261122531e-05, -7.890516309871257e-05, -7.880051271058619e-05]
-dam.m_flow=[1.992340564727783e+00, 1.910985949942575e+00, 1.826010234081186e+00, 1.736882202474163e+00, 1.642926112187831e+00, 1.543260335922241e+00, 1.436697107731769e+00, 1.32156916578447e+00, 1.195404332917014e+00, 1.054247522118036e+00, 8.910017609596252e-01, 6.901669719564741e-01, 3.479509125240351e-01, -3.479509125240351e-01, -6.901671515196637e-01, -8.910017609596252e-01, -1.05424740135125e+00, -1.19540433291718e+00, -1.321569165784316e+00, -1.436697195165726e+00, -1.543260335922241e+00, -1.642926035106992e+00, -1.736882238686527e+00, -1.82601019942889e+00, -1.910985999251742e+00, -1.992340564727783e+00, -1.988830093536735e+00, -1.978277819807499e+00, -1.958929267055818e+00, -1.926863166656667e+00, -1.875823020935059e+00, -1.79749852268815e+00, -1.683526084849956e+00, -1.530135289390165e+00, -1.344287510122468e+00, -1.150541543960571e+00, -9.691255002157082e-01, -8.10871014134414e-01, -6.790293166918413e-01, -5.720309612372618e-01, -4.847593009471893e-01, -4.127795523867874e-01, -3.530481566771182e-01, -3.031981912751953e-01, -2.614979804129648e-01, -2.266445010900497e-01, -1.970275978782754e-01, -1.593450535044784e-01, -1.171308986648302e-01, -7.971495584654131e-02, -5.15817366540432e-02, -3.261064624596659e-02, -2.056645366837729e-02, -1.311760067555475e-02, -8.534510826879173e-03, -5.693519953638315e-03, -3.905822570546483e-03, -2.75884783698515e-03, -2.00672023911448e-03, -1.502139190456374e-03, -1.155795063823462e-03, -9.127116860043279e-04, -7.384381219627138e-04, -6.109741330543517e-04, -5.160030380709805e-04, -4.440238699316978e-04, -3.886156437703431e-04, -3.453582383626434e-04, -3.111550089073593e-04, -2.838015261592786e-04, -2.617021964397281e-04, -2.43685778824688e-04, -2.288797869767652e-04, -2.166255296133291e-04, -2.06420294965799e-04, -1.978750369744375e-04, -1.906854139278677e-04, -1.846097220013216e-04, -1.794571958013162e-04, -1.750729675130138e-04, -1.713323290459812e-04, -1.681327338276003e-04, -1.653905525040777e-04, -1.630359884037015e-04, -1.61011373462324e-04, -1.592680782778189e-04, -1.577654149137153e-04, -1.564688588660684e-04, -1.553492171000384e-04, -1.543816929830435e-04, -1.535450719529763e-04, -1.528213598663487e-04, -1.521950187686446e-04, -1.516528566800012e-04, -1.511833845488291e-04, -1.507768465671688e-04, -1.504246893980213e-04, -1.501196824413701e-04, -1.498554044349963e-04, -1.496264745619835e-04, -1.494280149927363e-04]
-time=[0e+00, 2.4e+02]
-vav.dp=[5e+00, 4.599999920527121e+00, 4.199999841054439e+00, 3.799999920527172e+00, 3.400000158945593e+00, 3e+00, 2.599999841054407e+00, 2.199999920527266e+00, 1.800000079472544e+00, 1.400000039736525e+00, 1e+00, 5.999999602634757e-01, 1.999998758240322e-01, -1.999998758240322e-01, -6.000002781531776e-01, -1e+00, -1.399999721847012e+00, -1.80000007947305e+00, -2.199999920526761e+00, -2.600000158944456e+00, -3e+00, -3.399999841055544e+00, -3.800000079473238e+00, -4.199999682108562e+00, -4.600000158943697e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00, -5e+00]
-dam.dp=[2.679359018802643e-01, 2.465010293894953e-01, 2.250661568987268e-01, 2.036312801492316e-01, 1.82196411917186e-01, 1.607615351676941e-01, 1.393266584182022e-01, 1.178917891193045e-01, 9.645692940467473e-02, 7.502205265520318e-02, 5.35871796309948e-02, 3.215230288149764e-02, 8.639690006324075e-03, -8.639690006324075e-03, -3.215231991631092e-02, -5.35871796309948e-02, -7.502203562038838e-02, -9.645692940470184e-02, -1.178917891192773e-01, -1.393266754530102e-01, -1.607615351676941e-01, -1.82196394882378e-01, -2.036312886666914e-01, -2.25066148381267e-01, -2.465010421655803e-01, -2.679359018802643e-01, -2.845966627752612e-01, -3.345013038471473e-01, -4.253171445233336e-01, -5.738589206572164e-01, -8.052393794059753e-01, -1.148228275832564e+00, -1.621194768376393e+00, -2.208849995763998e+00, -2.845691833454411e+00, -3.421923398971558e+00, -3.880346754374681e+00, -4.216160881194365e+00, -4.450331923475632e+00, -4.609398440635613e+00, -4.704990863800049e+00, -4.763847319217874e+00, -4.805315924735949e+00, -4.836704288474481e+00, -4.86137343821025e+00, -4.881150722503662e+00, -4.897480477485636e+00, -4.917754622121915e+00, -4.939954784429387e+00, -4.959307681075114e+00, -4.973723888397217e+00, -4.983402723917036e+00, -4.989536755846878e+00, -4.9933271443733e+00, -4.995658869667254e+00, -4.997104167938232e+00, -4.998013498151179e+00, -4.998596667624946e+00, -4.998979092023246e+00, -4.999236106314748e+00, -4.999412059783936e+00, -4.999535560868626e+00, -4.999624252222322e+00, -4.99968910224258e+00, -4.999737739453852e+00, -4.999773979187012e+00, -4.999802112646041e+00, -4.999824523898496e+00, -4.999841690081666e+00, -4.999855518310748e+00, -4.999866962432861e+00, -4.999876022357057e+00, -4.999883651724303e+00, -4.999889850622519e+00, -4.999895095813069e+00, -4.999899387359619e+00, -4.999903202062948e+00, -4.999906063076803e+00, -4.999908924105815e+00, -4.999910831445352e+00, -4.999912738800049e+00, -4.999914646148682e+00, -4.999916076657125e+00, -4.999917030337504e+00, -4.999917984008789e+00, -4.999918937683105e+00, -4.999919891357422e+00, -4.99992036819458e+00, -4.99992084503477e+00, -4.999921321868896e+00, -4.999921798706055e+00, -4.999922275543213e+00, -4.999922752380371e+00, -4.999922752380371e+00, -4.999923229217529e+00, -4.999923229217529e+00, -4.999923706054688e+00, -4.999923706054688e+00, -4.999923706054688e+00, -4.999923706054688e+00, -4.999924182891846e+00]
-res.dp=[4.732064247131348e+00, 4.353498950742312e+00, 3.974933892771767e+00, 3.596368759587147e+00, 3.217803538412316e+00, 2.839238405227661e+00, 2.460673272043196e+00, 2.08210813885859e+00, 1.703543187320725e+00, 1.324978054136523e+00, 9.464128017425537e-01, 5.678476089532529e-01, 1.91360189542994e-01, -1.91360189542994e-01, -5.678479098081876e-01, -9.464128017425537e-01, -1.324977753281565e+00, -1.703543187321204e+00, -2.082108138858111e+00, -2.460673572897561e+00, -2.839238405227661e+00, -3.217803237557761e+00, -3.59636891001541e+00, -3.97493374234322e+00, -4.353499176383425e+00, -4.732064247131348e+00, -4.715403098806918e+00, -4.665498815362332e+00, -4.574683034290979e+00, -4.426141138947618e+00, -4.194760799407959e+00, -3.851771843375968e+00, -3.378805350832897e+00, -2.791150004236002e+00, -2.154308166545589e+00, -1.578076601028442e+00, -1.119653126416408e+00, -7.83839238014167e-01, -5.49668136128255e-01, -3.906016785728239e-01, -2.950092554092407e-01, -2.361528446937153e-01, -1.946841497690985e-01, -1.63295532714143e-01, -1.386267853067419e-01, -1.188490614295006e-01, -1.025194778114967e-01, -8.224547473411632e-02, -6.004529380180419e-02, -4.069234127608223e-02, -2.62759942561388e-02, -1.65970674669381e-02, -1.046344904170867e-02, -6.672807663578756e-03, -4.341188073288509e-03, -2.896015997976065e-03, -1.986682292586312e-03, -1.403271840540017e-03, -1.020704482667218e-03, -7.640520085413856e-04, -5.878863157704473e-04, -4.642437043089772e-04, -3.756007468752133e-04, -3.107671695932731e-04, -2.624608388996322e-04, -2.258492022519931e-04, -1.976662428041152e-04, -1.756637028736999e-04, -1.582665088854652e-04, -1.443533725261616e-04, -1.331127277808264e-04, -1.239488131294478e-04, -1.164178699922388e-04, -1.101848394765957e-04, -1.049940233235314e-04, -1.006475504254922e-04, -9.699060935757192e-05, -9.390025301321577e-05, -9.127946821477303e-05, -8.904946102501151e-05, -8.71468146215193e-05, -8.551936830937359e-05, -8.412457267008385e-05, -8.292694699045685e-05, -8.189714818307348e-05, -8.101043204078451e-05, -8.024611274423107e-05, -7.958662978925741e-05, -7.901713185795914e-05, -7.852500975538764e-05, -7.8099466918502e-05, -7.773135353711493e-05, -7.741277697280323e-05, -7.713700292388539e-05, -7.689821416512739e-05, -7.669143087696284e-05, -7.651231821084767e-05, -7.635717357031631e-05, -7.622274991056359e-05, -7.610630592098755e-05, -7.600535900564864e-05]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Motors_Examples_IdealMotor.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Motors_Examples_IdealMotor.txt
deleted file mode 100644
index 0f698441..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Motors_Examples_IdealMotor.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'number of continuous time states': '1', 'linear': ' '}
-mot.delta=[0.05000000074505805969, 0.05000000074505805969]
-mot.y=[0.5, 0.40000000596046447754, 0.30000001192092895508, 0.20000000298023223877, 0.10000000149011611938, -0.00000000000000010732, -0.00000000000000010732, -0.00000000000000010732, -0.00000000000000010732, -0.00000000000000010732, -0.00000000000000010732, 0.10000000149011611938, 0.20000000298023223877, 0.30000001192092895508, 0.40000000596046469958, 0.5, 0.60000002384185791016, 0.69999998807907126697, 0.80000001192092895508, 0.89999997615814208984, 1., 1., 0.89999997615814208984, 0.89999997615814208984, 0.80000001192092895508, 0.80000001192092895508, 0.69999998807907104492, 0.69999998807907104492, 0.60000002384185791016, 0.60000002384185791016, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.40000000596046447754, 0.40000000596046447754, 0.30000001192092895508, 0.30000001192092895508, 0.20000000298023223877, 0.20000000298023223877, 0.10000000149011611938, 0.10000000149011611938, 0.00000000004361638134, 0.00000000004361638134, 0.00000000004361638134, 0.00000000004361638134, 0.00000000004361638134, 0.00000000004361638134, 0.00000000004361638134, 0.00000000004361638134, 0.00000000004361638134, 0.00000000004361638134, 0.00000000004361638134, 0.10000000149011611938, 0.20000000298023223877, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.28333333134651184082, 0.38333332538604736328, 0.44999998807907104492, 0.51666665077209472656, 0.61666667461395263672, 0.64999997615814208984, 0.75, 0.85000002384185791016, 0.88333332538604736328, 0.98333334922790527344, 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0.91428571939468383789, 0.81428569555282592773, 0.71428573131561279297, 0.61428570747375488281, 0.51428574323654174805, 0.41428571939468383789, 0.31428572535514831543]
-ySet.y=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0.94999998807907104492, 0.89999997615814208984, 0.85000002384185791016, 0.80000001192092895508, 0.75, 0.69999998807907104492, 0.64999997615814208984, 0.60000002384185768811, 0.55000001192092895508, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.44999998807907126697, 0.40000000596046447754, 0.34999999403953552246, 0.30000001192092895508, 0.25, 0.20000000298023223877, 0.15000000596046447754, 0.10000000149011611938, 0.05000000074505805969, 0.00000000004487886104, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.32499998807907104492, 0.40000000596046447754, 0.47499999403953552246, 0.55000001192092895508, 0.625, 0.69999998807907104492, 0.77499997615814208984, 0.85000002384185791016, 0.92500001192092895508, 1., 1.04999995231628462378, 1.10000002384185746607, 1.14999997615814208984, 1.20000004768371582031, 1.25, 1.29999995231628417969, 1.35000002384185791016, 1.39999997615814208984, 1.45000004768371582031, 1.5, 1.32500004768371582031, 1.14999997615814208984, 0.97500002384185791016, 0.80000001192092895508, 0.625, 0.44999998807907104492, 0.27500000596046447754, 0.10000000149011611938, -0.07500000298023223877, -0.25]
-mot.uppHys.y=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 0., 1., 1., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0.]
-time=[0., 600.]
-mot.lowHys.y=[0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 1., 0., 1., 0., 1., 0.00000000000002368482, 1., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 1., 0., 1., 0., 1., 0., 1., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0.]
-mot.lowHys.u=[-0.5, -0.40000000596046447754, -0.30000001192092895508, -0.20000000298023223877, -0.10000000149011611938, 0.00000000000000010732, 0.00000000000000010732, 0.00000000000000010732, 0.00000000000000010732, 0.00000000000000010732, 0.00000000000000010732, 0.89999997615814208984, 0.80000001192092895508, 0.69999998807907104492, 0.60000002384185768811, 0.5, 0.40000000596046447754, 0.30000001192092873303, 0.20000000298023223877, 0.10000000149011611938, 0.00000000000000022204, -0.05000000074505805969, 0.0000000000005864198, -0.05000000074505805969, 0.00000000000062860828, -0.05000000074505805969, 0.00000000000067634787, -0.05000000074505805969, -0.0000000000000000148, -0.05000000074505805969, 0.00000000000000022204, -0.00000000005739009268, -0.00000000005739009268, -0.00000000005739009268, -0.00000000005739009268, -0.00000000005739009268, -0.00000000005739009268, -0.00000000005739009268, -0.00000000005739009268, -0.00000000005739009268, -0.00000000005739009268, -0.05000000074505782377, 0.00000000000107158726, -0.05000000074505805969, 0.00000000000000011102, -0.05000000074505805969, 0.00000000000116717747, -0.05000000074505805969, 0.00000000000000018041, -0.05000000074505805969, 0.00000000000126247992, -0.00000000004361638134, -0.00000000004361638134, -0.00000000004361638134, -0.00000000004361638134, -0.00000000004361638134, -0.00000000004361638134, -0.00000000004361638134, -0.00000000004361638134, -0.00000000004361638134, -0.00000000004361638134, 0.15000000596046447754, 0.05000000074505805969, -0.00000000000316585647, -0.00000000000316585647, -0.00000000000316585647, -0.00000000000316585647, -0.00000000000316585647, -0.00000000000316585647, -0.00000000000316585647, -0.00000000000316585647, 0.04166666790843009949, 0.01666666753590106964, 0.02500000037252902985, 0.03333333507180213928, 0.00833333376795053482, 0.05000000074505805969, 0.02500000037252902985, 0.00000000001218036783, 0.04166666790843009949, 0.01666666753590106964, 0.05000000074505853154, 0.10000000149011564754, 0.15000000596046447754, 0.20000000298023223877, 0.25, 0.30000001192092895508, 0.34999999403953552246, 0.40000000596046447754, 0.44999998807907104492, 0.5, 0.32499998807907104492, 0.15000000596046447754, -0.02500000037252902985, -0.11428571492433547974, -0.18928571045398712158, -0.26428571343421936035, -0.33928570151329040527, -0.41428571939468383789, -0.48928570747375488281, -0.56428569555282592773]
-mot.uppHys.u=[-0.5, -0.40000000596046447754, -0.30000001192092895508, -0.20000000298023223877, -0.10000000149011611938, 0.00000000000000010732, 0.00000000000000010732, 0.00000000000000010732, 0.00000000000000010732, 0.00000000000000010732, 0.00000000000000010732, 0.89999997615814208984, 0.80000001192092895508, 0.69999998807907104492, 0.60000002384185768811, 0.5, 0.40000000596046447754, 0.30000001192092873303, 0.20000000298023223877, 0.10000000149011611938, 0.00000000000000022204, -0.05000000074505805969, 0.0000000000005864198, -0.05000000074505805969, 0.00000000000062860828, -0.05000000074505805969, 0.00000000000067634787, -0.05000000074505805969, -0.0000000000000000148, -0.05000000074505805969, 0.00000000000000022204, -0.00000000005739009268, -0.00000000005739009268, -0.00000000005739009268, -0.00000000005739009268, -0.00000000005739009268, -0.00000000005739009268, -0.00000000005739009268, -0.00000000005739009268, -0.00000000005739009268, -0.00000000005739009268, -0.05000000074505782377, 0.00000000000107158726, -0.05000000074505805969, 0.00000000000000011102, -0.05000000074505805969, 0.00000000000116717747, -0.05000000074505805969, 0.00000000000000018041, -0.05000000074505805969, 0.00000000000126247992, -0.00000000004361638134, -0.00000000004361638134, -0.00000000004361638134, -0.00000000004361638134, -0.00000000004361638134, -0.00000000004361638134, -0.00000000004361638134, -0.00000000004361638134, -0.00000000004361638134, -0.00000000004361638134, 0.15000000596046447754, 0.05000000074505805969, -0.00000000000316585647, -0.00000000000316585647, -0.00000000000316585647, -0.00000000000316585647, -0.00000000000316585647, -0.00000000000316585647, -0.00000000000316585647, -0.00000000000316585647, 0.04166666790843009949, 0.01666666753590106964, 0.02500000037252902985, 0.03333333507180213928, 0.00833333376795053482, 0.05000000074505805969, 0.02500000037252902985, 0.00000000001218036783, 0.04166666790843009949, 0.01666666753590106964, 0.05000000074505853154, 0.10000000149011564754, 0.15000000596046447754, 0.20000000298023223877, 0.25, 0.30000001192092895508, 0.34999999403953552246, 0.40000000596046447754, 0.44999998807907104492, 0.5, 0.32499998807907104492, 0.15000000596046447754, -0.02500000037252902985, -0.11428571492433547974, -0.18928571045398712158, -0.26428571343421936035, -0.33928570151329040527, -0.41428571939468383789, -0.48928570747375488281, -0.56428569555282592773]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Examples_ThreeWayValves.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Examples_ThreeWayValves.txt
deleted file mode 100644
index e8b52340..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Examples_ThreeWayValves.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'number of continuous time states': '2', 'linear': ' '}
-valLin.res3.phi=[1., 0.99049997308478232583, 0.98100000577419621539, 0.97149997885899241901, 0.96200001154839231976, 0.95249998640269673, 0.94300001732258853515, 0.93349999217689338948, 0.92400002309678785917, 0.91450000149014010198, 0.90499997280539079547, 0.89550000372528626436, 0.88599997504061700493, 0.87650000596043253775, 0.86699998435378478057, 0.85750002235160416308, 0.84799998658893094294, 0.83850002458687467044, 0.82900000298028020396, 0.81950002682207412352, 0.81000000521542636633, 0.80049996945277102078, 0.79100000745057263973, 0.78149998584392488254, 0.77200000968571880211, 0.76249998807907104492, 0.75300001192086496449, 0.74350000447042030594, 0.73400002831217869836, 0.7244999925493634807, 0.71499998509891871112, 0.70550000894071274171, 0.69599997317807504871, 0.6865000253316710932, 0.6769999895692111469, 0.66750001341100517749, 0.65800000596056040791, 0.64850002980221221893, 0.63899999403950358268, 0.62949995827707905249, 0.62000001043085273267, 0.61049997466810856928, 0.60099999850979601845, 0.59149999105935124888, 0.58200001490114516844, 0.57249997913829442364, 0.5630000312922457395, 0.55349999552964368466, 0.54400001937143760422, 0.53450001192099294567, 0.52499997615814208984, 0.51550000000007101253, 0.50599996423792359401, 0.49649995827738813148, 0.48700000894053679934, 0.47750000298014338984, 0.46799999701981742639, 0.45849999105946320777, 0.4489999850992118513, 0.43949997913856975185, 0.43000002980178952949, 0.42050002384153817303, 0.41100001788128687208, 0.40149998211871312792, 0.39199997615846182697, 0.38249997019821047051, 0.37300002086143024815, 0.3635000149007881487, 0.35400000894053679223, 0.34450000298018257361, 0.33499999701985661016, 0.32549999105946320066, 0.31600004172261186852, 0.30650000596032239697, 0.29699999999992893196, 0.28749999403953552246, 0.27799998807928422151, 0.26849998211903286505, 0.25899997615835523845, 0.24950002682161051548, 0.24000000596028681077, 0.23050000000003192935, 0.22099999403964215583, 0.21149998807931977285, 0.20199998211899738987, 0.19250001788103818234, 0.18300001192071579936, 0.17350000596039341638, 0.16400000000007106116, 0.15449997913869406574, 0.14499997317826510135, 0.13550002384146708767, 0.12600001788114470469, 0.11650000447024173866, 0.10699999850985195127, 0.09749998509906089572, 0.08799997913869410382, 0.07850002980178950873, 0.06900001639099312412, 0.05950001043065297757, 0.05000000074505805969]
-valLin.res1.phi=[0.05000000074505805969, 0.05950000158324818961, 0.06899999869614885373, 0.07850000325962661063, 0.08800000037252994622, 0.09749999571591817793, 0.10700000204891103872, 0.11649999739229707774, 0.12600000372528896708, 0.1354999955296543046, 0.14499999441206568029, 0.15449999329447702823, 0.16400000707804957001, 0.17350000596046091794, 0.18299999776482628322, 0.19249998956919159299, 0.20200001043078352758, 0.21150000223517551046, 0.22099999403954084798, 0.23049999999999823408, 0.23999999180438577606, 0.24950001266593327398, 0.25900000447033860729, 0.26849999627474391284, 0.27800000223521015297, 0.28749999403953552246, 0.29700000000006393508, 0.30649997764834613356, 0.31600001341103711727, 0.3255000193714411294, 0.33499999701968780075, 0.34450000298021626888, 0.35400000894063810009, 0.36349998658906240712, 0.37299999254944871119, 0.3824999985099238331, 0.39199997615825932229, 0.40149998211864562636, 0.41100001788135437364, 0.42050002384174067771, 0.4300000014900761669, 0.43950000745055128881, 0.44900001341093759288, 0.45849999105936189991, 0.46799999701978373112, 0.47750000298031219925, 0.4869999806285588706, 0.49649998658896288273, 0.50599999254949135086, 0.51549999999993600941, 0.52499997615814208984, 0.53450001192085794255, 0.54400004768300536107, 0.55350002384164476155, 0.56300000298039210023, 0.57249997913846317754, 0.58200001490111152869, 0.59149999105924999654, 0.60100002682196573822, 0.61050000298003681554, 0.61999998211878415422, 0.62949995827728155717, 0.63899999403957108424, 0.64850002980214471737, 0.65800000596035790323, 0.6675000417223632132, 0.67699996125795791624, 0.68649999701989217193, 0.69599997317817630105, 0.70550000894074638147, 0.71499998509874995722, 0.72450002086146580993, 0.73400000000021314861, 0.74349997615828422592, 0.75300001192099996761, 0.76249998807907104492, 0.77200002384150268053, 0.78149999999985786392, 0.79100003576257371662, 0.80049995529731576838, 0.80999999105939213262, 0.81950002682204048376, 0.82900000298017895162, 0.83850003874239731338, 0.84800001490096577061, 0.8574999940397131093, 0.86699997019821051225, 0.87650000596050003931, 0.88599998211857100561, 0.89550001788128685831, 0.90499999403935793563, 0.91449997317810527431, 0.92400000894082112701, 0.9334999850988920933, 0.94300002086160428227, 0.9524999970196789123, 0.96200003278239476501, 0.97149995231734997958, 0.980999988079213181, 0.99049996423756836439, 1.]
-valEquPerLin.res3.phi=[1., 0.99049997308478232583, 0.98100000577419621539, 0.97149997885899241901, 0.96200001154839231976, 0.95249998640269673, 0.94300001732258853515, 0.93349999217689338948, 0.92400002309678785917, 0.91450000149014010198, 0.90499997280539079547, 0.89550000372528626436, 0.88599997504061700493, 0.87650000596043253775, 0.86699998435378478057, 0.85750002235160416308, 0.84799998658893094294, 0.83850002458687467044, 0.82900000298028020396, 0.81950002682207412352, 0.81000000521542636633, 0.80049996945277102078, 0.79100000745057263973, 0.78149998584392488254, 0.77200000968571880211, 0.76249998807907104492, 0.75300001192086496449, 0.74350000447042030594, 0.73400002831217869836, 0.7244999925493634807, 0.71499998509891871112, 0.70550000894071274171, 0.69599997317807504871, 0.6865000253316710932, 0.6769999895692111469, 0.66750001341100517749, 0.65800000596056040791, 0.64850002980221221893, 0.63899999403950358268, 0.62949995827707905249, 0.62000001043085273267, 0.61049997466810856928, 0.60099999850979601845, 0.59149999105935124888, 0.58200001490114516844, 0.57249997913829442364, 0.5630000312922457395, 0.55349999552964368466, 0.54400001937143760422, 0.53450001192099294567, 0.52499997615814208984, 0.51550000000007101253, 0.50599996423792359401, 0.49649995827738813148, 0.48700000894053679934, 0.47750000298014338984, 0.46799999701981742639, 0.45849999105946320777, 0.4489999850992118513, 0.43949997913856975185, 0.43000002980178952949, 0.42050002384153817303, 0.41100001788128687208, 0.40149998211871312792, 0.39199997615846182697, 0.38249997019821047051, 0.37300002086143024815, 0.3635000149007881487, 0.35400000894053679223, 0.34450000298018257361, 0.33499999701985661016, 0.32549999105946320066, 0.31600004172261186852, 0.30650000596032239697, 0.29699999999992893196, 0.28749999403953552246, 0.27799998807928422151, 0.26849998211903286505, 0.25899997615835523845, 0.24950002682161051548, 0.24000000596028681077, 0.23050000000003192935, 0.22099999403964215583, 0.21149998807931977285, 0.20199998211899738987, 0.19250001788103818234, 0.18300001192071579936, 0.17350000596039341638, 0.16400000000007106116, 0.15449997913869406574, 0.14499997317826510135, 0.13550002384146708767, 0.12600001788114470469, 0.11650000447024173866, 0.10699999850985195127, 0.09749998509906089572, 0.08799997913869410382, 0.07850002980178950873, 0.06900001639099312412, 0.05950001043065297757, 0.05000000074505805969]
-valEquPerLin.res1.phi=[0.05000000074505805969, 0.09608265807521590429, 0.10471285145357266122, 0.10715193318021752622, 0.1096478181359665377, 0.11220184694397430936, 0.11481536215318027816, 0.11748975507321687828, 0.12022644331002874107, 0.12302687663091510517, 0.12589253442107350978, 0.12882494944173980556, 0.13182567141598300342, 0.13489629476700726318, 0.13803842644863667521, 0.14125375256239217081, 0.14454397678467614807, 0.14791083275117192231, 0.15135612835137529641, 0.15488165702213235742, 0.15848931561680365543, 0.16218100733597076712, 0.16595868811967215417, 0.16982436017338173317, 0.17378008580778567249, 0.17782793939113616943, 0.18197009367910410571, 0.18620870548490528473, 0.19054606504710244752, 0.19498446959256504618, 0.19952622999699484718, 0.20417378731002117087, 0.20892961668147347343, 0.21379620682869202031, 0.21877616464164451049, 0.22387211332723119805, 0.22908676407892972215, 0.23442287486298404864, 0.23988329138102135185, 0.24547090446737265812, 0.25118863238664690396, 0.2570395788903737655, 0.26302681169188152355, 0.26915347133882688846, 0.27542287262833703432, 0.28183830559789263548, 0.28840314789075505164, 0.29512092552316293581, 0.30199516567333878347, 0.30902954258981146785, 0.31622776389122009277, 0.32359365341013579531, 0.33113114503275137279, 0.33884417267798527806, 0.34673683126238136198, 0.35481338721400956793, 0.36307805577730367652, 0.37153524773676155357, 0.38018940363401376725, 0.38904517263507115699, 0.39810714925388840379, 0.40738026949141137312, 0.41686936756300152496, 0.42657950989955978338, 0.43651585231884604266, 0.44668361022209129851, 0.45708817469936924294, 0.46773512358300256553, 0.47863008785578203819, 0.48977881939499834374, 0.50118721910319508073, 0.51286139643783801301, 0.52480741866294644549, 0.53703174622199911781, 0.54954086530270762623, 0.56234133243560791016, 0.57543994262722597544, 0.58884366958547396109, 0.60255960628439608762, 0.61659499943656059795, 0.63095734775696976637, 0.64565419797122280965, 0.66069347756943841432, 0.6760829947522349892, 0.69183103457202033137, 0.70794572529041754905, 0.7244359612814486038, 0.74131023071782453648, 0.75857759356822007657, 0.77624716937227555835, 0.79432825644491256156, 0.81283045878436632758, 0.83176371246527469605, 0.85113804133917858596, 0.87096357824834080841, 0.89125093289484580428, 0.91201089368593379891, 0.93325424021016178955, 0.95499255049017284236, 0.97723720316914608475, 1.]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Examples_TwoWayValvePressureIndependent.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Examples_TwoWayValvePressureIndependent.txt
new file mode 100644
index 00000000..995b9ad0
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Examples_TwoWayValvePressureIndependent.txt
@@ -0,0 +1,16 @@
+last-generated=2017-05-02
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": " "
+}
+valInd.m_flow=[7.975000143051147e-02, 8.914597353455037e-02, 9.852390033157581e-02, 1.078837743710091e-01, 1.172256031034285e-01, 1.265493773433136e-01, 1.358550948449085e-01, 1.451427784776551e-01, 1.544124053583282e-01, 1.636639651378551e-01, 1.728975014051299e-01, 1.821129774573238e-01, 1.913104081952252e-01, 2.004897787182412e-01, 2.096510971096717e-01, 2.187943702125356e-01, 2.2791959671298e-01, 2.37026779216533e-01, 2.461158866296767e-01, 2.551869771624054e-01, 2.642399939758386e-01, 2.732749938526973e-01, 2.82291890264284e-01, 2.912907860910008e-01, 3.002716052967491e-01, 3.092343807220459e-01, 3.181791092718354e-01, 3.27105751004895e-01, 3.360143889306379e-01, 3.449049964138374e-01, 3.537774874385847e-01, 3.626319744951133e-01, 3.714684013073267e-01, 3.802867714258354e-01, 3.890871076131496e-01, 3.978693835564862e-01, 4.066335731645379e-01, 4.153797584824956e-01, 4.241079133592423e-01, 4.328179781903462e-01, 4.415099867077606e-01, 4.501839907156481e-01, 4.588399046773245e-01, 4.674777624865155e-01, 4.76097615625615e-01, 4.84699378718077e-01, 4.932830858188314e-01, 5.018487582868382e-01, 5.103964301143932e-01, 5.189259567048503e-01, 5.274375081062317e-01, 5.359309992623248e-01, 5.443721549886471e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01]
+valIndFromMflow.m_flow=[7.975000143051147e-02, 8.914597353455037e-02, 9.852390033157581e-02, 1.078837743710091e-01, 1.172256031034285e-01, 1.265493773433136e-01, 1.358550948449085e-01, 1.451427784776551e-01, 1.544124053583282e-01, 1.636639651378551e-01, 1.728975014051299e-01, 1.821129774573238e-01, 1.913104081952252e-01, 2.004897787182412e-01, 2.096510971096717e-01, 2.187943702125356e-01, 2.2791959671298e-01, 2.37026779216533e-01, 2.461158866296767e-01, 2.551869771624054e-01, 2.642399939758386e-01, 2.732749938526973e-01, 2.82291890264284e-01, 2.912907860910008e-01, 3.002716052967491e-01, 3.092343807220459e-01, 3.181791092718354e-01, 3.27105751004895e-01, 3.360143889306379e-01, 3.449049964138374e-01, 3.537774874385847e-01, 3.626319744951133e-01, 3.714684013073267e-01, 3.802867714258354e-01, 3.890871076131496e-01, 3.978693835564862e-01, 4.066335731645379e-01, 4.153797584824956e-01, 4.241079133592423e-01, 4.328179781903462e-01, 4.415099867077606e-01, 4.501839907156481e-01, 4.588399046773245e-01, 4.674777624865155e-01, 4.760925194248984e-01, 4.846679968166476e-01, 4.931861389357268e-01, 5.016263733366466e-01, 5.099622695828889e-01, 5.181558054691365e-01, 5.261468887329102e-01, 5.338250469242722e-01, 5.409394627153172e-01, 5.466186502187658e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01, 5.477225780487061e-01]
+valIndDpFix.m_flow=[6.975000351667404e-02, 7.914597562071293e-02, 8.852390241773837e-02, 9.78837764571692e-02, 1.072255977390105e-01, 1.165493719788984e-01, 1.258551043816516e-01, 1.351427731132371e-01, 1.444123999939235e-01, 1.536639746745716e-01, 1.628974960407229e-01, 1.721129720929058e-01, 1.813104028308071e-01, 1.904897733538587e-01, 1.996511066464104e-01, 2.087943648481176e-01, 2.179196062496965e-01, 2.27026773852115e-01, 2.361158961664199e-01, 2.451869717980051e-01, 2.542400035125373e-01, 2.63274973587118e-01, 2.722918998010271e-01, 2.812907658254216e-01, 2.902716148334124e-01, 2.992343604564667e-01, 3.081791188085786e-01, 3.171057605416382e-01, 3.260143984673811e-01, 3.349049761483825e-01, 3.437774969753279e-01, 3.526319840318564e-01, 3.614684108439633e-01, 3.702867511604516e-01, 3.790870873476237e-01, 3.878693930932294e-01, 3.966335827012811e-01, 4.053797680192388e-01, 4.141078930937341e-01, 4.228179877270893e-01, 4.315099962444149e-01, 4.401839704501222e-01, 4.470230055017883e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01, 4.472135901451111e-01]
+time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Examples_TwoWayValveTable.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Examples_TwoWayValveTable.txt
deleted file mode 100644
index cee7574b..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Examples_TwoWayValveTable.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'number of continuous time states': '1', 'linear': ' '}
-valTab.m_flow=[0.00000000000000030294, 0.00082805935036191994, 0.00164682316970290251, 0.0024567319154225175, 0.00325822604492050994, 0.00405174487900487098, 0.00483772960729792964, 0.00561661969419841294, 0.00638885530414015548, 0.00715487562749789023, 0.00791512232154024248, 0.00867003579449068112, 0.00942005423383289117, 0.01016561815558042828, 0.01090716845601522739, 0.01164514527520455096, 0.01237998835885081514, 0.01311180075620109638, 0.01383636840266249182, 0.0145521314645716722, 0.01525886708406430127, 0.01595635571242867354, 0.01664437361743914892, 0.01732270018930550173, 0.01799111290045768419, 0.01864939182996749878, 0.01929731541965527472, 0.0199346572819348207, 0.02056120328638925965, 0.02117672613402551626, 0.02178100611302380765, 0.02237382330878363162, 0.02295495238234007696, 0.02352417372661936082, 0.02407965975769061837, 0.02461622127893606585, 0.02513366119645758096, 0.02563218562734051811, 0.02611199416216302555, 0.02657328982988585442, 0.0270162725086809663, 0.02744114972558967316, 0.02784811757319644032, 0.02823737981398155572, 0.02860914179357126191, 0.0289636016269559371, 0.02930096323025155672, 0.02962142977838736618, 0.02992520140344726021, 0.03021248030712318788, 0.03048347122967243195, 0.03073561214434374078, 0.03096804065097552572, 0.03118351347222224693, 0.03138478058190232595, 0.03157459922326941865, 0.03175571556608803442, 0.03193089005790707147, 0.03210286824679414036, 0.03227441058093505344, 0.03244826155796151634, 0.03262717995890880573, 0.03281391775463736449, 0.03301122421854442435, 0.03322185979937409411, 0.03344856631774036082, 0.03369410642004549289, 0.03395999177736153118, 0.03423182646826968684, 0.0345047973748923778, 0.03477900508043485495, 0.03505453154143606948, 0.03533147568575068648, 0.03560992649615903061, 0.03588997545891201707, 0.03617171570658683777, 0.03645523664677237374, 0.03674062768634697024, 0.03702798568312483385, 0.03731739458745486626, 0.03760895098158081179, 0.03790274627930843854, 0.03819887361351432392, 0.03849741866593565931, 0.03879847829427773842, 0.03910213636225798317, 0.03940849334724950276, 0.03971763685451785292, 0.04002966001690668602, 0.04034465224167625708, 0.0406627029357493272, 0.04098390703262754647, 0.04130835404270470634, 0.04163613891901318115, 0.04196734734375619919, 0.04230207617506062667, 0.0426404110943972639, 0.04298244690960360825, 0.04332827710417019862, 0.04367799278374773914, 0.04403167963027954102]
-time=[0., 1.]
-kv.y=[0.00000000000000447197, 0.01222389311657515708, 0.02431056515904686174, 0.03626652141603302348, 0.04809825227499624906, 0.05981225805964588554, 0.07141504591480027364, 0.08291309292740388359, 0.09431290829367211526, 0.10562098368182332164, 0.11684381795074566535, 0.12798792189953500653, 0.1390597700858642316, 0.150065859422429837, 0.1610126935884541588, 0.17190677769509113415, 0.18275460987910568944, 0.1935576926280203891, 0.20425382985255902124, 0.21482000004927420678, 0.22525289345419802212, 0.23554929270405342012, 0.24570587397471688185, 0.2557193893380094174, 0.26558659005175577761, 0.2753041684627532959, 0.2848688752379006095, 0.29427738975200667948, 0.30352648983186947262, 0.31261292849913047132, 0.32153334158276442034, 0.33028456361705305078, 0.33886325965439761942, 0.34726615647673581, 0.35546630331583151108, 0.36338708266664937474, 0.37102558132229340737, 0.37838485491354123536, 0.38546783061907108348, 0.39227751848282316205, 0.3988168797302698021, 0.40508893350829122681, 0.41109664015237123991, 0.41684299303821709115, 0.42233094700200723981, 0.42756355414455010644, 0.43254369090095085015, 0.4372744565704340669, 0.44175875652322937892, 0.44599961839279789189, 0.44999998807907104492, 0.45372212270822809277, 0.45715326695342017871, 0.46033410110023870176, 0.46330522869301526967, 0.46610733539563253824, 0.46878102359004619748, 0.47136694375350635111, 0.47390571658580388226, 0.47643802237684762524, 0.47900443651729113226, 0.48164563987614267271, 0.48440226778385803152, 0.48731494094092342451, 0.49042433964508047595, 0.49377105476124028005, 0.49739571423481554469, 0.50132077264238661396, 0.50533353994912633134, 0.50936323500641655926, 0.51341104991353225806, 0.51747847478774489094, 0.52156673689788080051, 0.52567725587882363492, 0.52981137834172942203, 0.53397041559219360352, 0.53815579815050151868, 0.54236877771390923364, 0.54661072519265707648, 0.55088304553886691117, 0.55518704138148866623, 0.55952405825839068854, 0.56389552668987985573, 0.56830269837475377859, 0.5727469442217205664, 0.57722960830143354993, 0.58175205535146878866, 0.58631568928707056276, 0.59092176181416344871, 0.59557170344848531229, 0.60026682549165266689, 0.60500847044802519292, 0.60979800613788714969, 0.61463677535613414626, 0.61952608941088360694, 0.62446737882260006103, 0.62946195488994971523, 0.63451109865834043333, 0.63961630081615294952, 0.64477878314445846719, 0.64999997615814208984]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Examples_TwoWayValves.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Examples_TwoWayValves.txt
deleted file mode 100644
index b012df4d..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Examples_TwoWayValves.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-last-generated=2015-08-05
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 1, 1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "0, 0, 0",
- "linear": " "
-}
-valInd.phi=[0.05000000074505805969, 0.05950000158324818961, 0.06899999869614885373, 0.07850000325962661063, 0.08800000037252994622, 0.09749999571591817793, 0.10700000204891103872, 0.11649999739229707774, 0.12600000372528896708, 0.1354999955296543046, 0.14499999441206568029, 0.15449999329447702823, 0.16400000707804957001, 0.17350000596046091794, 0.18299999776482628322, 0.19249998956919159299, 0.20200001043078352758, 0.21150000223517551046, 0.22099999403954084798, 0.23049999999999823408, 0.23999999180438577606, 0.24950001266593327398, 0.25900000447033860729, 0.26849999627474391284, 0.27800000223521015297, 0.28749999403953552246, 0.29700000000006393508, 0.30649997764834613356, 0.31600001341103711727, 0.3255000193714411294, 0.33499999701968780075, 0.34450000298021626888, 0.35400000894063810009, 0.36349998658906240712, 0.37299999254944871119, 0.3824999985099238331, 0.39199997615825932229, 0.40149998211864562636, 0.41100001788135437364, 0.42050002384174067771, 0.4300000014900761669, 0.43950000745055128881, 0.44900001341093759288, 0.45849999105936189991, 0.46799999701978373112, 0.47750000298031219925, 0.4869999806285588706, 0.49649998658896288273, 0.50599999254949135086, 0.51549999999993600941, 0.52499997615814208984, 0.53450001192085794255, 0.54400004768300536107, 0.55350002384164476155, 0.56300000298039210023, 0.57249997913846317754, 0.58200001490111152869, 0.59149999105924999654, 0.60100002682196573822, 0.61050000298003681554, 0.61999998211878415422, 0.62949995827728155717, 0.63899999403957108424, 0.64850002980214471737, 0.65800000596035790323, 0.6675000417223632132, 0.67699996125795791624, 0.68649999701989217193, 0.69599997317817630105, 0.70550000894074638147, 0.71499998509874995722, 0.72450002086146580993, 0.73400000000021314861, 0.74349997615828422592, 0.75300001192099996761, 0.76249998807907104492, 0.77200002384150268053, 0.78149999999985786392, 0.79100003576257371662, 0.80049995529731576838, 0.80999999105939213262, 0.81950002682204048376, 0.82900000298017895162, 0.83850003874239731338, 0.84800001490096577061, 0.8574999940397131093, 0.86699997019821051225, 0.87650000596050003931, 0.88599998211857100561, 0.89550001788128685831, 0.90499999403935793563, 0.91449997317810527431, 0.92400000894082112701, 0.9334999850988920933, 0.94300002086160428227, 0.9524999970196789123, 0.96200003278239476501, 0.97149995231734997958, 0.980999988079213181, 0.99049996423756836439, 1.]
-valEqu.phi=[0.05000000074505805969, 0.05758925544297516241, 0.06517850641560279934, 0.07276776483880764701, 0.08035701581143783745, 0.0879462728210336081, 0.09529345577260069089, 0.10216369459980534362, 0.1085678275458521469, 0.1145166436066717558, 0.1200209699080692638, 0.12509162752718636091, 0.12973940490454421992, 0.13397515010513286193, 0.13780966379185732862, 0.1412537525352583756, 0.14454397678467614807, 0.14791083275117192231, 0.15135612835137529641, 0.15488165702213235742, 0.15848931561680365543, 0.16218100733597076712, 0.16595868811967215417, 0.16982436017338173317, 0.17378008580778567249, 0.17782793939113616943, 0.18197009367910410571, 0.18620870548490528473, 0.19054606504710244752, 0.19498446959256504618, 0.19952622999699484718, 0.20417378731002117087, 0.20892961668147347343, 0.21379620682869202031, 0.21877616464164451049, 0.22387211332723119805, 0.22908676407892972215, 0.23442287486298404864, 0.23988329138102135185, 0.24547090446737265812, 0.25118863238664690396, 0.2570395788903737655, 0.26302681169188152355, 0.26915347133882688846, 0.27542287262833703432, 0.28183830559789263548, 0.28840314789075505164, 0.29512092552316293581, 0.30199516567333878347, 0.30902954258981146785, 0.31622776389122009277, 0.32359365341013579531, 0.33113114503275137279, 0.33884417267798527806, 0.34673683126238136198, 0.35481338721400956793, 0.36307805577730367652, 0.37153524773676155357, 0.38018940363401376725, 0.38904517263507115699, 0.39810714925388840379, 0.40738026949141137312, 0.41686936756300152496, 0.42657950989955978338, 0.43651585231884604266, 0.44668361022209129851, 0.45708817469936924294, 0.46773512358300256553, 0.47863008785578203819, 0.48977881939499834374, 0.50118721910319508073, 0.51286139643783801301, 0.52480741866294644549, 0.53703174622199911781, 0.54954086530270762623, 0.56234133243560791016, 0.57543994262722597544, 0.58884366958547396109, 0.60255960628439608762, 0.61659499943656059795, 0.63095734775696976637, 0.64565419797122280965, 0.66069347756943841432, 0.6760829947522349892, 0.69183103457202033137, 0.70794572529041754905, 0.7244359612814486038, 0.74131023071782453648, 0.75857759356822007657, 0.77624716937227555835, 0.79432825644491256156, 0.81283045878436632758, 0.83176371246527469605, 0.85113804133917858596, 0.87096357824834080841, 0.89125093289484580428, 0.91201089368593379891, 0.93325424021016178955, 0.95499255049017284236, 0.97723720316914608475, 1.]
-valLin.phi=[0.05000000074505805969, 0.05950000158324818961, 0.06899999869614885373, 0.07850000325962661063, 0.08800000037252994622, 0.09749999571591817793, 0.10700000204891103872, 0.11649999739229707774, 0.12600000372528896708, 0.1354999955296543046, 0.14499999441206568029, 0.15449999329447702823, 0.16400000707804957001, 0.17350000596046091794, 0.18299999776482628322, 0.19249998956919159299, 0.20200001043078352758, 0.21150000223517551046, 0.22099999403954084798, 0.23049999999999823408, 0.23999999180438577606, 0.24950001266593327398, 0.25900000447033860729, 0.26849999627474391284, 0.27800000223521015297, 0.28749999403953552246, 0.29700000000006393508, 0.30649997764834613356, 0.31600001341103711727, 0.3255000193714411294, 0.33499999701968780075, 0.34450000298021626888, 0.35400000894063810009, 0.36349998658906240712, 0.37299999254944871119, 0.3824999985099238331, 0.39199997615825932229, 0.40149998211864562636, 0.41100001788135437364, 0.42050002384174067771, 0.4300000014900761669, 0.43950000745055128881, 0.44900001341093759288, 0.45849999105936189991, 0.46799999701978373112, 0.47750000298031219925, 0.4869999806285588706, 0.49649998658896288273, 0.50599999254949135086, 0.51549999999993600941, 0.52499997615814208984, 0.53450001192085794255, 0.54400004768300536107, 0.55350002384164476155, 0.56300000298039210023, 0.57249997913846317754, 0.58200001490111152869, 0.59149999105924999654, 0.60100002682196573822, 0.61050000298003681554, 0.61999998211878415422, 0.62949995827728155717, 0.63899999403957108424, 0.64850002980214471737, 0.65800000596035790323, 0.6675000417223632132, 0.67699996125795791624, 0.68649999701989217193, 0.69599997317817630105, 0.70550000894074638147, 0.71499998509874995722, 0.72450002086146580993, 0.73400000000021314861, 0.74349997615828422592, 0.75300001192099996761, 0.76249998807907104492, 0.77200002384150268053, 0.78149999999985786392, 0.79100003576257371662, 0.80049995529731576838, 0.80999999105939213262, 0.81950002682204048376, 0.82900000298017895162, 0.83850003874239731338, 0.84800001490096577061, 0.8574999940397131093, 0.86699997019821051225, 0.87650000596050003931, 0.88599998211857100561, 0.89550001788128685831, 0.90499999403935793563, 0.91449997317810527431, 0.92400000894082112701, 0.9334999850988920933, 0.94300002086160428227, 0.9524999970196789123, 0.96200003278239476501, 0.97149995231734997958, 0.980999988079213181, 0.99049996423756836439, 1.]
-valQui.phi=[0.05000000074505805969, 0.12988516814946740596, 0.17706066535052328303, 0.21026727750334095468, 0.23714204350914211417, 0.26035374238407121839, 0.2811130311556624406, 0.30008012001633938004, 0.31766110960424953635, 0.33412709257473693913, 0.34966999065719867046, 0.36443170990604661919, 0.37852079044348535541, 0.39202255639107058682, 0.40500551385941263582, 0.41752573111836427389, 0.42962980694967917161, 0.44135692508493629127, 0.45274045258532635838, 0.46380913517259086953, 0.47458779493927427673, 0.4850982495509872372, 0.49535963059898091565, 0.505388911391393858, 0.5152012757774039331, 0.52481019496917724609, 0.53422785692991303641, 0.54346530645967172646, 0.55253255259976663538, 0.56143868704937394121, 0.57019196904430879957, 0.57880008016782780178, 0.58727002743954626052, 0.59560822353899633974, 0.60382067865248834071, 0.61191297055612381417, 0.61989008245634547034, 0.62775694950881488765, 0.63551801810222452449, 0.64317734136606152795, 0.65073889045519650587, 0.65820634630181185099, 0.66558314330136358894, 0.67287247854109100142, 0.68007737568748549695, 0.68720073351341848245, 0.69424521337824296463, 0.70121347986741799918, 0.70810789604916313245, 0.71493076630151963791, 0.72168427705764770508, 0.72837049402875853055, 0.73499144379106051694, 0.74154891448986548497, 0.74804471534653116382, 0.75448065231781114015, 0.76085823622826798118, 0.76717907640046179019, 0.77344472256404528387, 0.77965648602963277813, 0.78581570115499388418, 0.7919238718682546363, 0.79798209379270346187, 0.80399161862417545255, 0.80995363845897672128, 0.8158691665845947405, 0.82173936024331739603, 0.82756518348299645815, 0.83334773366537595596, 0.83908784525758384198, 0.844786471932251537, 0.85044456737191753692, 0.85606287306954831351, 0.86164229047012441676, 0.86718356082329650647, 0.87268757820129394531, 0.87815493864601723573, 0.88358647663158806917, 0.88898284781080405548, 0.89434461638178208709, 0.89967262111358858867, 0.90496742599448309896, 0.91022962706761534335, 0.9154598203845074611, 0.9206585423902682308, 0.92582641802855847324, 0.93096398574025918116, 0.93607175107201912034, 0.94115025046393618879, 0.94619990115065522041, 0.95122135878639524353, 0.95621489171785711836, 0.96118109591290379345, 0.9661203587565723172, 0.97103309748105537391, 0.97591984852684388052, 0.98078085031795025905, 0.98561661054942029114, 0.99042754449639724967, 0.99521398088776080737, 0.99997627735137939453]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Examples_TwoWayValvesMotor.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Examples_TwoWayValvesMotor.txt
deleted file mode 100644
index 0fbe0947..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Examples_TwoWayValvesMotor.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-last-generated=2015-08-05
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 1, 1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "0, 0, 0",
- "number of continuous time states": "1",
- "linear": " "
-}
-valInd.phi=[0.52499997615814208984, 0.43000000715255737305, 0.33500000834465026855, 0.23999999463558197021, 0.14499999582767486572, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.14499999582767486572, 0.23999999463558197021, 0.33500000834465026855, 0.43000000715255759509, 0.52499997615814208984, 0.62000000476837158203, 0.71499997377395652087, 0.81000000238418579102, 0.90499997138977050781, 1., 1., 0.90499997138977050781, 0.90499997138977050781, 0.81000000238418579102, 0.81000000238418579102, 0.71499997377395629883, 0.71499997377395629883, 0.62000000476837158203, 0.62000000476837158203, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.43000000715255737305, 0.43000000715255737305, 0.33500000834465026855, 0.33500000834465026855, 0.23999999463558197021, 0.23999999463558197021, 0.14499999582767486572, 0.14499999582767486572, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.14499999582767486572, 0.23999999463558197021, 0.28749999403953552246, 0.28749999403953552246, 0.28749999403953552246, 0.28749999403953552246, 0.28749999403953552246, 0.28749999403953552246, 0.28749999403953552246, 0.28749999403953552246, 0.31916666030883789062, 0.41416665911674499512, 0.47749999165534973145, 0.54083335399627685547, 0.63583332300186157227, 0.66750001907348632812, 0.76249998807907104492, 0.85750001668930053711, 0.88916665315628051758, 0.98416668176651000977, 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0.91857141256332397461, 0.82357144355773925781, 0.72857141494750976562, 0.63357144594192504883, 0.53857141733169555664, 0.44357141852378845215, 0.34857141971588134766]
-valEqu.phi=[0.31622776389122009277, 0.25118863582611083984, 0.19952623546123504639, 0.15848931670188903809, 0.12002097070217132568, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.12002097070217132568, 0.15848931670188903809, 0.19952623546123504639, 0.25118863582611100638, 0.31622776389122009277, 0.39810717105865478516, 0.50118720531463656354, 0.63095736503601074219, 0.79432821273803710938, 1., 1., 0.79432821273803710938, 0.79432821273803710938, 0.63095736503601074219, 0.63095736503601074219, 0.50118720531463623047, 0.50118720531463623047, 0.39810717105865478516, 0.39810717105865478516, 0.31622776389122009277, 0.31622776389122009277, 0.31622776389122009277, 0.31622776389122009277, 0.31622776389122009277, 0.31622776389122009277, 0.31622776389122009277, 0.31622776389122009277, 0.31622776389122009277, 0.31622776389122009277, 0.31622776389122009277, 0.31622776389122009277, 0.25118863582611083984, 0.25118863582611083984, 0.19952623546123504639, 0.19952623546123504639, 0.15848931670188903809, 0.15848931670188903809, 0.12002097070217132568, 0.12002097070217132568, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.12002097070217132568, 0.15848931670188903809, 0.17782793939113616943, 0.17782793939113616943, 0.17782793939113616943, 0.17782793939113616943, 0.17782793939113616943, 0.17782793939113616943, 0.17782793939113616943, 0.17782793939113616943, 0.19201418757438659668, 0.24173155426979064941, 0.28183829784393310547, 0.32859933376312255859, 0.41368204355239868164, 0.44668358564376831055, 0.56234133243560791016, 0.70794576406478881836, 0.76442229747772216797, 0.96235060691833496094, 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0.82089143991470336914, 0.65205723047256469727, 0.5179474949836730957, 0.41142028570175170898, 0.32680276036262512207, 0.25958865880966186523, 0.20619860291481018066]
-valLin.phi=[0.52499997615814208984, 0.43000000715255737305, 0.33500000834465026855, 0.23999999463558197021, 0.14499999582767486572, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.14499999582767486572, 0.23999999463558197021, 0.33500000834465026855, 0.43000000715255759509, 0.52499997615814208984, 0.62000000476837158203, 0.71499997377395652087, 0.81000000238418579102, 0.90499997138977050781, 1., 1., 0.90499997138977050781, 0.90499997138977050781, 0.81000000238418579102, 0.81000000238418579102, 0.71499997377395629883, 0.71499997377395629883, 0.62000000476837158203, 0.62000000476837158203, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.52499997615814208984, 0.43000000715255737305, 0.43000000715255737305, 0.33500000834465026855, 0.33500000834465026855, 0.23999999463558197021, 0.23999999463558197021, 0.14499999582767486572, 0.14499999582767486572, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.14499999582767486572, 0.23999999463558197021, 0.28749999403953552246, 0.28749999403953552246, 0.28749999403953552246, 0.28749999403953552246, 0.28749999403953552246, 0.28749999403953552246, 0.28749999403953552246, 0.28749999403953552246, 0.31916666030883789062, 0.41416665911674499512, 0.47749999165534973145, 0.54083335399627685547, 0.63583332300186157227, 0.66750001907348632812, 0.76249998807907104492, 0.85750001668930053711, 0.88916665315628051758, 0.98416668176651000977, 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0.91857141256332397461, 0.82357144355773925781, 0.72857141494750976562, 0.63357144594192504883, 0.53857141733169555664, 0.44357141852378845215, 0.34857141971588134766]
-valQui.phi=[0.72168427705764770508, 0.65073889493942260742, 0.57019197940826416016, 0.47458779811859130859, 0.34966999292373657227, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.34966999292373657227, 0.47458779811859130859, 0.57019197940826416016, 0.65073889493942282947, 0.72168427705764770508, 0.78581571578979492188, 0.8447864651679993786, 0.89967262744903564453, 0.95122134685516357422, 0.99997627735137939453, 0.99997627735137939453, 0.95122134685516357422, 0.95122134685516357422, 0.89967262744903564453, 0.89967262744903564453, 0.84478646516799926758, 0.84478646516799926758, 0.78581571578979492188, 0.78581571578979492188, 0.72168427705764770508, 0.72168427705764770508, 0.72168427705764770508, 0.72168427705764770508, 0.72168427705764770508, 0.72168427705764770508, 0.72168427705764770508, 0.72168427705764770508, 0.72168427705764770508, 0.72168427705764770508, 0.72168427705764770508, 0.72168427705764770508, 0.65073889493942260742, 0.65073889493942260742, 0.57019197940826416016, 0.57019197940826416016, 0.47458779811859130859, 0.47458779811859130859, 0.34966999292373657227, 0.34966999292373657227, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.05000000074505805969, 0.34966999292373657227, 0.47458779811859130859, 0.52481019496917724609, 0.52481019496917724609, 0.52481019496917724609, 0.52481019496917724609, 0.52481019496917724609, 0.52481019496917724609, 0.52481019496917724609, 0.52481019496917724609, 0.55551874637603759766, 0.63808220624923706055, 0.68720072507858276367, 0.73279160261154174805, 0.79596817493438720703, 0.81586915254592895508, 0.87268757820129394531, 0.92582643032073974609, 0.94283664226531982422, 0.99202573299407958984, 0.99997627735137939453, 0.99997627735137939453, 0.99997627735137939453, 0.99997627735137939453, 0.99997627735137939453, 0.99997627735137939453, 0.99997627735137939453, 0.99997627735137939453, 0.99997627735137939453, 0.99997627735137939453, 0.99997627735137939453, 0.99997627735137939453, 0.99997627735137939453, 0.95834660530090332031, 0.90722662210464477539, 0.85285723209381103516, 0.79452627897262573242, 0.73121595382690429688, 0.66137874126434326172, 0.58244657516479492188]
-time=[0., 600.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Examples_TwoWayValvesTable.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Examples_TwoWayValvesTable.txt
deleted file mode 100644
index 7c488e4c..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Examples_TwoWayValvesTable.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-last-generated=2017-05-01
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-valLin.m_flow=[1.406250021318556e-06, 1.397608282570495e-02, 4.019600242367335e-02, 6.019400194273686e-02, 8.019200146180287e-02, 1.00189997255952e-01, 1.201880004999374e-01, 1.401859962940816e-01, 1.601839995380619e-01, 1.801819878824065e-01, 2.001799911263714e-01, 2.201779943703406e-01, 2.401760125154622e-01, 2.60174015759427e-01, 2.801719892026238e-01, 3.001699924481429e-01, 3.201679956906067e-01, 3.401659989360725e-01, 3.601639723792692e-01, 3.801620054240021e-01, 4.001600086694769e-01, 4.201580119119318e-01, 4.401560151574509e-01, 4.601539886006477e-01, 4.801520216453805e-01, 5.001500248908997e-01, 5.20147998331272e-01, 5.401459717772932e-01, 5.601440048220261e-01, 5.801420378667589e-01, 6.001399517084195e-01, 6.201379847531524e-01, 6.401360177978853e-01, 6.601339912441907e-01, 6.801319646842788e-01, 7.001299977290116e-01, 7.20127971175317e-01, 7.401260042200499e-01, 7.601240372647828e-01, 7.80122010704871e-01, 8.001199841511764e-01, 8.201180171959092e-01, 8.401160502406421e-01, 8.601139640823027e-01, 8.801119971270356e-01, 9.001100301717685e-01, 9.201080036180739e-01, 9.401059770581974e-01, 9.601040101028948e-01, 9.801019835492002e-01, 1.000100016593933e+00, 1.020097990033737e+00, 1.04009608268283e+00, 1.060094056122635e+00, 1.08009191036736e+00, 1.100090003016453e+00, 1.120087976456115e+00, 1.14008606910535e+00, 1.160084042545154e+00, 1.180082015984958e+00, 1.200079989438973e+00, 1.220077962878777e+00, 1.240075936318581e+00, 1.260074028967674e+00, 1.280072002407478e+00, 1.300070095056572e+00, 1.320067949301297e+00, 1.340065922741101e+00, 1.360064015390194e+00, 1.38006198883014e+00, 1.400060081479091e+00, 1.420058054918895e+00, 1.44005590916362e+00, 1.460054001812714e+00, 1.480051975252518e+00, 1.500049948692322e+00, 1.520048041341415e+00, 1.540046014781219e+00, 1.560044107430313e+00, 1.580041961675038e+00, 1.600039935114842e+00, 1.620038027763793e+00, 1.640036001203739e+00, 1.660033974644538e+00, 1.680032067292636e+00, 1.700029921537362e+00, 1.720028014186455e+00, 1.740025987626259e+00, 1.760023961066063e+00, 1.780022053715156e+00, 1.80002002715496e+00, 1.820018000607412e+00, 1.840015974048779e+00, 1.860013947488583e+00, 1.880012040137818e+00, 1.90001001357748e+00, 1.920007987018563e+00, 1.940005960471298e+00, 1.960003933911103e+00, 1.980002026560196e+00, 2e+00]
-valTab.m_flow=[1.406250021318556e-06, 1.397608282570495e-02, 4.019600242367335e-02, 6.019400194273686e-02, 8.019200146180287e-02, 1.00189997255952e-01, 1.201880004999374e-01, 1.401859962940816e-01, 1.601839995380619e-01, 1.801819878824065e-01, 2.001799911263714e-01, 2.201779943703406e-01, 2.401760125154622e-01, 2.60174015759427e-01, 2.801719892026238e-01, 3.001699924481429e-01, 3.201679956906067e-01, 3.401659989360725e-01, 3.601639723792692e-01, 3.801620054240021e-01, 4.001600086694769e-01, 4.201580119119318e-01, 4.401560151574509e-01, 4.601539886006477e-01, 4.801520216453805e-01, 5.001500248908997e-01, 5.20147998331272e-01, 5.401459717772932e-01, 5.601440048220261e-01, 5.801420378667589e-01, 6.001399517084195e-01, 6.201379847531524e-01, 6.401360177978853e-01, 6.601339912441907e-01, 6.801319646842788e-01, 7.001299977290116e-01, 7.20127971175317e-01, 7.401260042200499e-01, 7.601240372647828e-01, 7.80122010704871e-01, 8.001199841511764e-01, 8.201180171959092e-01, 8.401160502406421e-01, 8.601139640823027e-01, 8.801119971270356e-01, 9.001100301717685e-01, 9.201080036180739e-01, 9.401059770581974e-01, 9.601040101028948e-01, 9.801019835492002e-01, 1.000100016593933e+00, 1.020097990033737e+00, 1.04009608268283e+00, 1.060094056122635e+00, 1.08009191036736e+00, 1.100090003016453e+00, 1.120087976456115e+00, 1.14008606910535e+00, 1.160084042545154e+00, 1.180082015984958e+00, 1.200079989438973e+00, 1.220077962878777e+00, 1.240075936318581e+00, 1.260074028967674e+00, 1.280072002407478e+00, 1.300070095056572e+00, 1.320067949301297e+00, 1.340065922741101e+00, 1.360064015390194e+00, 1.38006198883014e+00, 1.400060081479091e+00, 1.420058054918895e+00, 1.44005590916362e+00, 1.460054001812714e+00, 1.480051975252518e+00, 1.500049948692322e+00, 1.520048041341415e+00, 1.540046014781219e+00, 1.560044107430313e+00, 1.580041961675038e+00, 1.600039935114842e+00, 1.620038027763793e+00, 1.640036001203739e+00, 1.660033974644538e+00, 1.680032067292636e+00, 1.700029921537362e+00, 1.720028014186455e+00, 1.740025987626259e+00, 1.760023961066063e+00, 1.780022053715156e+00, 1.80002002715496e+00, 1.820018000607412e+00, 1.840015974048779e+00, 1.860013947488583e+00, 1.880012040137818e+00, 1.90001001357748e+00, 1.920007987018563e+00, 1.940005960471298e+00, 1.960003933911103e+00, 1.980002026560196e+00, 2e+00]
-time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Validation_ThreeWayValveParameterization.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Validation_ThreeWayValveParameterization.txt
deleted file mode 100644
index e3d3f571..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Validation_ThreeWayValveParameterization.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-last-generated=2017-06-07
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-senM_flowCv.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
-senM_flowKv.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
-senM_flowOpPoi.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
-senM_flowAv.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
-time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Validation_TwoWayValveParameterization.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Validation_TwoWayValveParameterization.txt
deleted file mode 100644
index 334f7f01..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Actuators_Valves_Validation_TwoWayValveParameterization.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-last-generated=2017-06-07
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 1, 1, 1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "0, 0, 0, 0",
- "linear": " "
-}
-valCv.m_flow=[2.81250009948053e-07, 2.795216518574881e-03, 8.039199925941291e-03, 1.203880020228311e-02, 1.603839954730285e-02, 2.003799907866179e-02, 2.403760009998698e-02, 2.803719963134501e-02, 3.203680065266978e-02, 3.603639683142591e-02, 4.003599971538872e-02, 4.40355988740679e-02, 4.803520175803737e-02, 5.203480091671655e-02, 5.603440082075632e-02, 6.003399699950579e-02, 6.403359913812133e-02, 6.803320276744142e-02, 7.203279894618089e-02, 7.603240108479865e-02, 8.003199726355811e-02, 8.403159940217365e-02, 8.803120303148929e-02, 9.203079921023322e-02, 9.603040134885985e-02, 1.000299975275993e-01, 1.04029607116771e-01, 1.080291973356589e-01, 1.1202879947429e-01, 1.160284016129122e-01, 1.200279918318089e-01, 1.240276014209717e-01, 1.280272035595984e-01, 1.320268012290313e-01, 1.360263959170774e-01, 1.400260055062846e-01, 1.440255882746629e-01, 1.480251978637635e-01, 1.520248074529353e-01, 1.560244021410168e-01, 1.600239998104497e-01, 1.640235944984958e-01, 1.68023204087703e-01, 1.720228017571359e-01, 1.76022396445182e-01, 1.800220060343892e-01, 1.840216037038221e-01, 1.880211983918682e-01, 1.920208079809955e-01, 1.960203907494182e-01, 2.000200003385544e-01, 2.040196099276337e-01, 2.08019204615694e-01, 2.120188142048444e-01, 2.160183850538001e-01, 2.200179946427906e-01, 2.240176042319126e-01, 2.280171989199302e-01, 2.320168085090806e-01, 2.360164031970698e-01, 2.400159889470268e-01, 2.440155985361772e-01, 2.480151932242019e-01, 2.520147879121556e-01, 2.560144124024672e-01, 2.600140070904564e-01, 2.64013577939643e-01, 2.680132024295638e-01, 2.720127971175531e-01, 2.760123918055706e-01, 2.800120162956762e-01, 2.84011610983843e-01, 2.880111818326388e-01, 2.920108063229504e-01, 2.960104010109396e-01, 3.000099956989288e-01, 3.04009590386918e-01, 3.080092148772297e-01, 3.120088095652189e-01, 3.160083804143344e-01, 3.200080049043262e-01, 3.24007599592287e-01, 3.280071942803046e-01, 3.320068187703675e-01, 3.360064134586054e-01, 3.400059843074013e-01, 3.440056087977129e-01, 3.480052034857021e-01, 3.520047981736912e-01, 3.560043928616805e-01, 3.600040173519921e-01, 3.640035882007879e-01, 3.680031828887771e-01, 3.720028073790887e-01, 3.760024020671063e-01, 3.800019967550671e-01, 3.840016212450589e-01, 3.880011920941744e-01, 3.920007867821637e-01, 3.96000381470295e-01, 4.000000059604645e-01]
-valKv.m_flow=[2.81250009948053e-07, 2.795216518574881e-03, 8.039199925941291e-03, 1.203880020228311e-02, 1.603839954730285e-02, 2.003799907866179e-02, 2.403760009998698e-02, 2.803719963134501e-02, 3.203680065266978e-02, 3.603639683142591e-02, 4.003599971538872e-02, 4.40355988740679e-02, 4.803520175803737e-02, 5.203480091671655e-02, 5.603440082075632e-02, 6.003399699950579e-02, 6.403359913812133e-02, 6.803320276744142e-02, 7.203279894618089e-02, 7.603240108479865e-02, 8.003199726355811e-02, 8.403159940217365e-02, 8.803120303148929e-02, 9.203079921023322e-02, 9.603040134885985e-02, 1.000299975275993e-01, 1.04029607116771e-01, 1.080291973356589e-01, 1.1202879947429e-01, 1.160284016129122e-01, 1.200279918318089e-01, 1.240276014209717e-01, 1.280272035595984e-01, 1.320268012290313e-01, 1.360263959170774e-01, 1.400260055062846e-01, 1.440255882746629e-01, 1.480251978637635e-01, 1.520248074529353e-01, 1.560244021410168e-01, 1.600239998104497e-01, 1.640235944984958e-01, 1.68023204087703e-01, 1.720228017571359e-01, 1.76022396445182e-01, 1.800220060343892e-01, 1.840216037038221e-01, 1.880211983918682e-01, 1.920208079809955e-01, 1.960203907494182e-01, 2.000200003385544e-01, 2.040196099276337e-01, 2.08019204615694e-01, 2.120188142048444e-01, 2.160183850538001e-01, 2.200179946427906e-01, 2.240176042319126e-01, 2.280171989199302e-01, 2.320168085090806e-01, 2.360164031970698e-01, 2.400159889470268e-01, 2.440155985361772e-01, 2.480151932242019e-01, 2.520147879121556e-01, 2.560144124024672e-01, 2.600140070904564e-01, 2.64013577939643e-01, 2.680132024295638e-01, 2.720127971175531e-01, 2.760123918055706e-01, 2.800120162956762e-01, 2.84011610983843e-01, 2.880111818326388e-01, 2.920108063229504e-01, 2.960104010109396e-01, 3.000099956989288e-01, 3.04009590386918e-01, 3.080092148772297e-01, 3.120088095652189e-01, 3.160083804143344e-01, 3.200080049043262e-01, 3.24007599592287e-01, 3.280071942803046e-01, 3.320068187703675e-01, 3.360064134586054e-01, 3.400059843074013e-01, 3.440056087977129e-01, 3.480052034857021e-01, 3.520047981736912e-01, 3.560043928616805e-01, 3.600040173519921e-01, 3.640035882007879e-01, 3.680031828887771e-01, 3.720028073790887e-01, 3.760024020671063e-01, 3.800019967550671e-01, 3.840016212450589e-01, 3.880011920941744e-01, 3.920007867821637e-01, 3.96000381470295e-01, 4.000000059604645e-01]
-valOPPoi.m_flow=[2.81250009948053e-07, 2.795216518574881e-03, 8.039199925941291e-03, 1.203880020228311e-02, 1.603839954730285e-02, 2.003799907866179e-02, 2.403760009998698e-02, 2.803719963134501e-02, 3.203680065266978e-02, 3.603639683142591e-02, 4.003599971538872e-02, 4.40355988740679e-02, 4.803520175803737e-02, 5.203480091671655e-02, 5.603440082075632e-02, 6.003399699950579e-02, 6.403359913812133e-02, 6.803320276744142e-02, 7.203279894618089e-02, 7.603240108479865e-02, 8.003199726355811e-02, 8.403159940217365e-02, 8.803120303148929e-02, 9.203079921023322e-02, 9.603040134885985e-02, 1.000299975275993e-01, 1.04029607116771e-01, 1.080291973356589e-01, 1.1202879947429e-01, 1.160284016129122e-01, 1.200279918318089e-01, 1.240276014209717e-01, 1.280272035595984e-01, 1.320268012290313e-01, 1.360263959170774e-01, 1.400260055062846e-01, 1.440255882746629e-01, 1.480251978637635e-01, 1.520248074529353e-01, 1.560244021410168e-01, 1.600239998104497e-01, 1.640235944984958e-01, 1.68023204087703e-01, 1.720228017571359e-01, 1.76022396445182e-01, 1.800220060343892e-01, 1.840216037038221e-01, 1.880211983918682e-01, 1.920208079809955e-01, 1.960203907494182e-01, 2.000200003385544e-01, 2.040196099276337e-01, 2.08019204615694e-01, 2.120188142048444e-01, 2.160183850538001e-01, 2.200179946427906e-01, 2.240176042319126e-01, 2.280171989199302e-01, 2.320168085090806e-01, 2.360164031970698e-01, 2.400159889470268e-01, 2.440155985361772e-01, 2.480151932242019e-01, 2.520147879121556e-01, 2.560144124024672e-01, 2.600140070904564e-01, 2.64013577939643e-01, 2.680132024295638e-01, 2.720127971175531e-01, 2.760123918055706e-01, 2.800120162956762e-01, 2.84011610983843e-01, 2.880111818326388e-01, 2.920108063229504e-01, 2.960104010109396e-01, 3.000099956989288e-01, 3.04009590386918e-01, 3.080092148772297e-01, 3.120088095652189e-01, 3.160083804143344e-01, 3.200080049043262e-01, 3.24007599592287e-01, 3.280071942803046e-01, 3.320068187703675e-01, 3.360064134586054e-01, 3.400059843074013e-01, 3.440056087977129e-01, 3.480052034857021e-01, 3.520047981736912e-01, 3.560043928616805e-01, 3.600040173519921e-01, 3.640035882007879e-01, 3.680031828887771e-01, 3.720028073790887e-01, 3.760024020671063e-01, 3.800019967550671e-01, 3.840016212450589e-01, 3.880011920941744e-01, 3.920007867821637e-01, 3.96000381470295e-01, 4.000000059604645e-01]
-valAv.m_flow=[2.81250009948053e-07, 2.795216518574881e-03, 8.039199925941291e-03, 1.203880020228311e-02, 1.603839954730285e-02, 2.003799907866179e-02, 2.403760009998698e-02, 2.803719963134501e-02, 3.203680065266978e-02, 3.603639683142591e-02, 4.003599971538872e-02, 4.40355988740679e-02, 4.803520175803737e-02, 5.203480091671655e-02, 5.603440082075632e-02, 6.003399699950579e-02, 6.403359913812133e-02, 6.803320276744142e-02, 7.203279894618089e-02, 7.603240108479865e-02, 8.003199726355811e-02, 8.403159940217365e-02, 8.803120303148929e-02, 9.203079921023322e-02, 9.603040134885985e-02, 1.000299975275993e-01, 1.04029607116771e-01, 1.080291973356589e-01, 1.1202879947429e-01, 1.160284016129122e-01, 1.200279918318089e-01, 1.240276014209717e-01, 1.280272035595984e-01, 1.320268012290313e-01, 1.360263959170774e-01, 1.400260055062846e-01, 1.440255882746629e-01, 1.480251978637635e-01, 1.520248074529353e-01, 1.560244021410168e-01, 1.600239998104497e-01, 1.640235944984958e-01, 1.68023204087703e-01, 1.720228017571359e-01, 1.76022396445182e-01, 1.800220060343892e-01, 1.840216037038221e-01, 1.880211983918682e-01, 1.920208079809955e-01, 1.960203907494182e-01, 2.000200003385544e-01, 2.040196099276337e-01, 2.08019204615694e-01, 2.120188142048444e-01, 2.160183850538001e-01, 2.200179946427906e-01, 2.240176042319126e-01, 2.280171989199302e-01, 2.320168085090806e-01, 2.360164031970698e-01, 2.400159889470268e-01, 2.440155985361772e-01, 2.480151932242019e-01, 2.520147879121556e-01, 2.560144124024672e-01, 2.600140070904564e-01, 2.64013577939643e-01, 2.680132024295638e-01, 2.720127971175531e-01, 2.760123918055706e-01, 2.800120162956762e-01, 2.84011610983843e-01, 2.880111818326388e-01, 2.920108063229504e-01, 2.960104010109396e-01, 3.000099956989288e-01, 3.04009590386918e-01, 3.080092148772297e-01, 3.120088095652189e-01, 3.160083804143344e-01, 3.200080049043262e-01, 3.24007599592287e-01, 3.280071942803046e-01, 3.320068187703675e-01, 3.360064134586054e-01, 3.400059843074013e-01, 3.440056087977129e-01, 3.480052034857021e-01, 3.520047981736912e-01, 3.560043928616805e-01, 3.600040173519921e-01, 3.640035882007879e-01, 3.680031828887771e-01, 3.720028073790887e-01, 3.760024020671063e-01, 3.800019967550671e-01, 3.840016212450589e-01, 3.880011920941744e-01, 3.920007867821637e-01, 3.96000381470295e-01, 4.000000059604645e-01]
-time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_BasicFlowFunction_dp_DerivativeCheck.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_BasicFlowFunction_dp_DerivativeCheck.txt
new file mode 100644
index 00000000..a6d898cf
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_BasicFlowFunction_dp_DerivativeCheck.txt
@@ -0,0 +1,11 @@
+last-generated=2017-05-01
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "1",
+ "linear": " "
+}
+m_flow_comp=[-6.99999988079071e-01, -6.92964606687226e-01, -6.858571248329555e-01, -6.786751755728897e-01, -6.714163957664762e-01, -6.640783040170639e-01, -6.566581743844857e-01, -6.491532271693042e-01, -6.415605645076435e-01, -6.33876922507598e-01, -6.260989857696254e-01, -6.182232016312296e-01, -6.102457680793727e-01, -6.021627148873642e-01, -5.939696312982745e-01, -5.85661952707032e-01, -5.772346823807614e-01, -5.686825996726783e-01, -5.599998894237517e-01, -5.511804201831055e-01, -5.422175418709051e-01, -5.331040101326382e-01, -5.238319028174013e-01, -5.143927233347648e-01, -5.047770831000474e-01, -4.949746429920197e-01, -4.849741214957423e-01, -4.747629718539537e-01, -4.643273366128194e-01, -4.536517333109166e-01, -4.427187409711393e-01, -4.315088418306717e-01, -4.199998593096793e-01, -4.081664957927921e-01, -3.95979647279704e-01, -3.834056181770449e-01, -3.704050175382905e-01, -3.569295769613784e-01, -3.426818887165366e-01, -3.269529948517229e-01, -3.09162673470833e-01, -2.889142554384935e-01, -2.65977893598212e-01, -2.402740261747986e-01, -2.118565330688285e-01, -1.808961158711516e-01, -1.476636261399021e-01, -1.12513350862146e-01, -7.586632834981034e-02, -3.819366629340288e-02, 1.674288796094797e-07, 3.819400156952974e-02, 7.586667107651614e-02, 1.125136861382729e-01, 1.476639688666098e-01, 1.808964436967036e-01, 2.118568608943749e-01, 2.402743689015037e-01, 2.659782512260805e-01, 2.889145832640929e-01, 3.091630310987017e-01, 3.269533226772781e-01, 3.426822165421228e-01, 3.569299047869957e-01, 3.704053453638368e-01, 3.834059460025911e-01, 3.959799751052504e-01, 4.081667938160427e-01, 4.200001871352256e-01, 4.315091696562179e-01, 4.427190687966855e-01, 4.536520611364628e-01, 4.643276644383657e-01, 4.747632698772398e-01, 4.849744195188862e-01, 4.949749410152435e-01, 5.047773811232713e-01, 5.143930213579887e-01, 5.238322008406252e-01, 5.331043081556134e-01, 5.42217839894129e-01, 5.511807182063294e-01, 5.600001874467624e-01, 5.686828380916482e-01, 5.772349804038787e-01, 5.856621911256111e-01, 5.939698697168536e-01, 6.021629533059433e-01, 6.102460064979518e-01, 6.182234400498087e-01, 6.260992241882045e-01, 6.338771609260705e-01, 6.415608029262228e-01, 6.491534655878833e-01, 6.566584128030647e-01, 6.640784828309981e-01, 6.714165745804105e-01, 6.78675354386824e-01, 6.858573036472095e-01, 6.929647855014446e-01, 7.000001668930054e-01]
+m_flow=[-6.99999988079071e-01, -6.929646662918708e-01, -6.858571248332752e-01, -6.786751755728897e-01, -6.714163957664762e-01, -6.640783040170639e-01, -6.566582339891305e-01, -6.49153286773949e-01, -6.415606241122883e-01, -6.338769821121362e-01, -6.260990453742702e-01, -6.182232612358743e-01, -6.102458276840175e-01, -6.021627744920089e-01, -5.939696909029193e-01, -5.856620123116768e-01, -5.772348015899443e-01, -5.686826592777139e-01, -5.600000086328281e-01, -5.511805393923951e-01, -5.422176610801946e-01, -5.331041293416791e-01, -5.238320220266909e-01, -5.143928425440544e-01, -5.047772023090528e-01, -4.949747323989868e-01, -4.849742407049519e-01, -4.747630910632433e-01, -4.643274856244314e-01, -4.536518525202061e-01, -4.427188601804733e-01, -4.315089908422836e-01, -4.199999785190754e-01, -4.08166644804404e-01, -3.95979796291316e-01, -3.834057969908904e-01, -3.704051963522249e-01, -3.569297557753127e-01, -3.426820377281885e-01, -3.269531736656572e-01, -3.091628522847674e-01, -2.889144044501587e-01, -2.659780724121463e-01, -2.402742049887307e-01, -2.118566969816016e-01, -1.808962797839303e-01, -1.476637900526819e-01, -1.125135222254973e-01, -7.586649971316407e-02, -3.819383393146631e-02, 0e+00, 3.819383393146631e-02, 7.586649971316407e-02, 1.125135222254973e-01, 1.476637900526821e-01, 1.808962797839305e-01, 2.118566969816018e-01, 2.402742049887306e-01, 2.659780724121462e-01, 2.889144044501586e-01, 3.091628522847674e-01, 3.269531736656572e-01, 3.426820377281885e-01, 3.569297557753127e-01, 3.704051963522249e-01, 3.834057969908904e-01, 3.959797962913161e-01, 4.081666448044041e-01, 4.199999785190755e-01, 4.315089908422836e-01, 4.427188601804732e-01, 4.536518525202061e-01, 4.643274856244314e-01, 4.747630910632433e-01, 4.849742407049519e-01, 4.949747323989868e-01, 5.047772023090528e-01, 5.143928425440544e-01, 5.238320220266909e-01, 5.331041293416791e-01, 5.422176610801946e-01, 5.511805393923951e-01, 5.600000086328281e-01, 5.686826592777139e-01, 5.772348015899443e-01, 5.856620123116768e-01, 5.939696909029193e-01, 6.021627744920089e-01, 6.102458276840175e-01, 6.182232612358743e-01, 6.260990453742702e-01, 6.338769821121362e-01, 6.415606241122884e-01, 6.49153286773949e-01, 6.566582339891304e-01, 6.640783040170638e-01, 6.714163957664762e-01, 6.786751755728897e-01, 6.858571248332752e-01, 6.929646662918708e-01, 6.99999988079071e-01]
+time=[-2e+00, 2e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_BasicFlowFunction_dp_DerivativeCheck2.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_BasicFlowFunction_dp_DerivativeCheck2.txt
new file mode 100644
index 00000000..0d43887d
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_BasicFlowFunction_dp_DerivativeCheck2.txt
@@ -0,0 +1,16 @@
+last-generated=2017-05-01
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "2",
+ "linear": " "
+}
+m_flow_turbulent=[3.600000143051147e-01, 3.600000143051147e-01]
+m_flow_comp=[-9.899494647979736e-01, -9.603999573041618e-01, -9.311505272577497e-01, -9.022041593580427e-01, -8.735641003627406e-01, -8.452337720459185e-01, -8.172163433769563e-01, -7.895155948336282e-01, -7.621351837829436e-01, -7.350787020656161e-01, -7.083502253711381e-01, -6.819538253726684e-01, -6.558936957952459e-01, -6.301742074428451e-01, -6.048000094914007e-01, -5.797758846776501e-01, -5.551066311166472e-01, -5.307975691564124e-01, -5.068541935414653e-01, -4.832819942600863e-01, -4.600869739461885e-01, -4.372754584069271e-01, -4.148538384217614e-01, -3.928291563927763e-01, -3.712086882181478e-01, -3.499471843242645e-01, -3.279369893201347e-01, -3.040212287991241e-01, -2.782121034198688e-01, -2.511158169287465e-01, -2.235408790399018e-01, -1.962830041545776e-01, -1.700202491844513e-01, -1.452749627242312e-01, -1.22411989109624e-01, -1.016560081034536e-01, -8.31159417512518e-02, -6.681013842575044e-02, -5.268945528282709e-02, -4.065641455217857e-02, -3.058026411119815e-02, -2.230831348473167e-02, -1.567403521014348e-02, -1.050261674456585e-02, -6.614601697977764e-03, -3.828093012341386e-03, -1.960047425972433e-03, -8.269367982555267e-04, -2.450663777651285e-04, -3.069522312172382e-05, -7.411494351572528e-08, 3.054699003724965e-05, 2.449180646451145e-04, 8.267879612665123e-04, 1.959897250207076e-03, 3.827940275439335e-03, 6.614444770123335e-03, 1.050245376311541e-02, 1.567386384678805e-02, 2.230813280815549e-02, 3.058007225875056e-02, 4.065620966121215e-02, 5.268923549069449e-02, 6.680990000717134e-02, 8.31156958820921e-02, 1.016557473331327e-01, 1.22411720888696e-01, 1.452746796021687e-01, 1.700199660623888e-01, 1.962827210325148e-01, 2.235405959178168e-01, 2.511155189055224e-01, 2.782118053966627e-01, 3.040209605782226e-01, 3.279366912969907e-01, 3.49946916103363e-01, 3.712084199971042e-01, 3.928288881718748e-01, 4.148536000031645e-01, 4.372751901860256e-01, 4.600867057252871e-01, 4.832817260392204e-01, 5.068539551228861e-01, 5.307973307378333e-01, 5.551063926981746e-01, 5.79775646259071e-01, 6.047997710728216e-01, 6.30173969024266e-01, 6.558934573768089e-01, 6.81953646558734e-01, 7.083499869527367e-01, 7.350785232516818e-01, 7.621349453647556e-01, 7.895154160194808e-01, 8.172161645630217e-01, 8.45233593231984e-01, 8.735639215488061e-01, 9.022039805441439e-01, 9.311504080484602e-01, 9.603998380945881e-01, 9.899493455886841e-01]
+m_flow=[-9.899494647979736e-01, -9.603999573041618e-01, -9.311505272577497e-01, -9.022041593580427e-01, -8.735641003627406e-01, -8.45233712441629e-01, -8.172163433769563e-01, -7.89515594833415e-01, -7.621351241786897e-01, -7.350786424610779e-01, -7.08350165766671e-01, -6.819538253726684e-01, -6.558936361907433e-01, -6.30174207442703e-01, -6.047999498871822e-01, -5.797758250731829e-01, -5.551066311166472e-01, -5.307975691560216e-01, -5.068541339368206e-01, -4.83281934655477e-01, -4.600869143415438e-01, -4.372753988022823e-01, -4.14853808619439e-01, -3.928290967881315e-01, -3.712086286135031e-01, -3.499471545219421e-01, -3.279369297154899e-01, -3.040211691945415e-01, -2.78212043815224e-01, -2.511157573241017e-01, -2.235408194352571e-01, -1.962829445499329e-01, -1.700201895798066e-01, -1.452748882184386e-01, -1.224119295049526e-01, -1.016559410482283e-01, -8.311587469602864e-02, -6.681007882110566e-02, -5.268939940346762e-02, -4.065636239811439e-02, -3.058021568242427e-02, -2.230826505595779e-02, -1.567398491872612e-02, -1.050256645314668e-02, -6.614548612591635e-03, -3.828037365817206e-03, -1.959988286989257e-03, -8.26874166812657e-04, -2.449999919280323e-04, -3.062500285487593e-05, -1.270549420881451e-21, 3.062500285487593e-05, 2.449999919280323e-04, 8.268741668126569e-04, 1.959988286989265e-03, 3.828037365817218e-03, 6.614548612591654e-03, 1.050256645314666e-02, 1.567398491872608e-02, 2.230826505595775e-02, 3.058021568242427e-02, 4.065636239811439e-02, 5.268939940346762e-02, 6.681007882110566e-02, 8.311587469602864e-02, 1.016559410482283e-01, 1.224119295049527e-01, 1.452748882184387e-01, 1.700201895798067e-01, 1.962829445499327e-01, 2.235408194352569e-01, 2.511157573241015e-01, 2.78212043815224e-01, 3.040211691945415e-01, 3.279369297154899e-01, 3.499471545219421e-01, 3.712086286135031e-01, 3.928290967881315e-01, 4.14853808619439e-01, 4.372753988022823e-01, 4.600869143415439e-01, 4.832819346554771e-01, 5.068541339368204e-01, 5.307975691560216e-01, 5.551066311166472e-01, 5.797758250731829e-01, 6.047999498871822e-01, 6.30174207442703e-01, 6.558936361907433e-01, 6.819538253726684e-01, 7.08350165766671e-01, 7.350786424610779e-01, 7.621351241786899e-01, 7.895155948334152e-01, 8.17216343376956e-01, 8.452337124416288e-01, 8.735641003627405e-01, 9.022041593580427e-01, 9.311505272577497e-01, 9.603999573041618e-01, 9.899494647979736e-01]
+time=[-2e+00, 2e+00]
+der(m_flow_comp)=[7.424620985984802e-01, 7.350000071451323e-01, 7.274613461646999e-01, 7.198437461435371e-01, 7.121446067998167e-01, 7.043613884660356e-01, 6.964911837352863e-01, 6.885310354121091e-01, 6.8047774899059e-01, 6.723279982290377e-01, 6.64078290276794e-01, 6.557247758806609e-01, 6.472634713674867e-01, 6.38690050295517e-01, 6.299999826972537e-01, 6.211883478530672e-01, 6.122499076067308e-01, 6.03179025568774e-01, 5.939696497438555e-01, 5.846152283085263e-01, 5.751086359010974e-01, 5.654422722012504e-01, 5.556077349258242e-01, 5.455959330676741e-01, 5.353970029606018e-01, 5.330719947814941e-01, 5.721978282760957e-01, 6.232692200705818e-01, 6.645045239367717e-01, 6.868557242091179e-01, 6.885335415459178e-01, 6.715210136597874e-01, 6.394396142889321e-01, 5.963131699470199e-01, 5.459101983891914e-01, 4.914450909414647e-01, 4.354918267766547e-01, 3.800113164966812e-01, 3.264349541939334e-01, 2.7576622660897e-01, 2.286805145848493e-01, 1.856130067607495e-01, 1.468307889148041e-01, 1.124886637438302e-01, 8.267048376751467e-02, 5.741784553945964e-02, 3.674924914534019e-02, 2.067171505215409e-02, 9.187401703604619e-03, 2.296777787874456e-03, -9.75278666710106e-08, 2.296778020705074e-03, 9.187399840959261e-03, 2.067170015099164e-02, 3.674921561772594e-02, 5.741779338539559e-02, 8.267040181112326e-02, 1.124885519851222e-01, 1.468306548043398e-01, 1.856128279468149e-01, 2.286803059686036e-01, 2.757659881903908e-01, 3.264346859730319e-01, 3.800110482758507e-01, 4.354915883580667e-01, 4.914448525227967e-01, 5.459099599706126e-01, 5.963129911330326e-01, 6.39439435474998e-01, 6.715208944504978e-01, 6.88533481941273e-01, 6.868556646046686e-01, 6.645045239367717e-01, 6.232692200705818e-01, 5.721978878809003e-01, 5.330721139907837e-01, 5.353971221698913e-01, 5.455960522769636e-01, 5.556078541351137e-01, 5.6544239141054e-01, 5.751087551103869e-01, 5.84615347517816e-01, 5.93969768953145e-01, 6.031791447780636e-01, 6.122500268160204e-01, 6.211884670623568e-01, 6.300000423018984e-01, 6.386901099001617e-01, 6.472635309722736e-01, 6.55724835485732e-01, 6.640783498816164e-01, 6.723281174382206e-01, 6.804778681994889e-01, 6.885310950167539e-01, 6.96491243339931e-01, 7.043614480706804e-01, 7.121446664044615e-01, 7.198438057481819e-01, 7.274614057693447e-01, 7.35000066749777e-01, 7.42462158203125e-01]
+der(m_flow)=[7.424620985984802e-01, 7.350000071451323e-01, 7.274613461646999e-01, 7.198437461435371e-01, 7.121446664042128e-01, 7.043614480703251e-01, 6.964911837353573e-01, 6.885310354121091e-01, 6.804778085952348e-01, 6.723280578335759e-01, 6.640782902769716e-01, 6.557247758810872e-01, 6.472634713676289e-01, 6.38690050295517e-01, 6.299999826972537e-01, 6.21188407457712e-01, 6.122499672113756e-01, 6.03179085173028e-01, 5.939697093485002e-01, 5.846152283085974e-01, 5.751086955053869e-01, 5.654423318058952e-01, 5.556077945304689e-01, 5.455959926723188e-01, 5.353970625652466e-01, 5.330720543861389e-01, 5.721978878809003e-01, 6.232692200707062e-01, 6.645045239368073e-01, 6.868557838137627e-01, 6.885336011505626e-01, 6.715210732644322e-01, 6.394396738933638e-01, 5.963132295516114e-01, 5.459101983891914e-01, 4.914450909414647e-01, 4.354918267766547e-01, 3.800113164966812e-01, 3.264349541939334e-01, 2.7576622660897e-01, 2.286805443871827e-01, 1.856130663653676e-01, 1.468308634205968e-01, 1.124887382496362e-01, 8.267056572389624e-02, 5.741793494642541e-02, 3.674934227759765e-02, 2.067181004705607e-02, 9.187497629830012e-03, 2.296875111083478e-03, 4.743384504624082e-19, 2.296875111083478e-03, 9.187497629830012e-03, 2.067181004705607e-02, 3.674934227759775e-02, 5.741793494642554e-02, 8.267056572389639e-02, 1.12488738249636e-01, 1.468308634205966e-01, 1.856130663653674e-01, 2.286805443871827e-01, 2.757662266089699e-01, 3.264349541939334e-01, 3.800113164966812e-01, 4.354918267766547e-01, 4.914450909414647e-01, 5.459101983891917e-01, 5.963132295516117e-01, 6.39439673893364e-01, 6.715210732644321e-01, 6.885336011505625e-01, 6.868557838137628e-01, 6.645045239368073e-01, 6.232692200707062e-01, 5.721978878809003e-01, 5.330720543861389e-01, 5.353970625652466e-01, 5.455959926723188e-01, 5.556077945304689e-01, 5.654423318058952e-01, 5.751086955053869e-01, 5.846152283085975e-01, 5.939697093485002e-01, 6.03179085173028e-01, 6.122499672113756e-01, 6.21188407457712e-01, 6.299999826972537e-01, 6.38690050295517e-01, 6.472634713676289e-01, 6.557247758810872e-01, 6.640782902769716e-01, 6.723280578335759e-01, 6.804778085952349e-01, 6.885310354121091e-01, 6.964911837353572e-01, 7.043614480703251e-01, 7.121446664042128e-01, 7.198437461435371e-01, 7.274613461646999e-01, 7.350000071451323e-01, 7.424620985984802e-01]
+err_m_flow=[-2.710505431213761e-18, 8.323115389993399e-09, 8.279669085991659e-09, 1.081046583463791e-08, 1.385854058996066e-08, 1.560067995503637e-08, 1.707837567471525e-08, 1.863521205808843e-08, 2.057364633511264e-08, 2.278858608916259e-08, 2.479287451775551e-08, 2.619215416343108e-08, 2.760900773334272e-08, 2.903419982447501e-08, 3.080681528302024e-08, 3.259002903909262e-08, 3.429464783377629e-08, 3.59749589754075e-08, 3.797277383298303e-08, 4.000269680595592e-08, 4.214941617034228e-08, 4.446860166962683e-08, 4.744040205241901e-08, 5.042498677841726e-08, 4.924639674280755e-08, 4.624068239422741e-08, 4.856693318270652e-08, 5.227286826932936e-08, 5.514219450261142e-08, 5.73840943618723e-08, 5.922251893308367e-08, 6.077571833081082e-08, 6.215363977973489e-08, 6.377958089633899e-08, 6.450856899951839e-08, 6.473232618899178e-08, 6.469795010164774e-08, 6.372882106223032e-08, 5.803627990517125e-08, 5.274564101477234e-08, 4.892782674098329e-08, 4.869163576264052e-08, 4.914414820763395e-08, 5.071672510431581e-08, 5.294598859000351e-08, 5.579282836682059e-08, 5.906074531903841e-08, 6.26231721790763e-08, 6.637169019576006e-08, 7.02214818759697e-08, 7.411494351572401e-08, 7.801149601668142e-08, 8.192665763840155e-08, 8.619777278789943e-08, 9.12007114528856e-08, 9.695721512346183e-08, 1.041438164549385e-07, 1.123356551937939e-07, 1.215436089490538e-07, 1.318035563354647e-07, 1.421733043724566e-07, 1.527830597287461e-07, 1.631111272527209e-07, 1.733103736129361e-07, 1.835321790648424e-07, 1.937687495334559e-07, 2.039671934079653e-07, 2.139824868609349e-07, 2.219148126951965e-07, 2.274370992404302e-07, 2.309291167104447e-07, 2.327951745012694e-07, 2.330779549670831e-07, 2.333719638485386e-07, 2.310975702633022e-07, 2.239200114217965e-07, 2.29667303783092e-07, 2.256397667052768e-07, 2.158835324571831e-07, 2.096900532300761e-07, 2.068559743469248e-07, 2.053027832344908e-07, 2.033855093360744e-07, 2.009096144423321e-07, 1.982254655163403e-07, 1.95169688358006e-07, 1.917982270744129e-07, 1.874293381534277e-07, 1.838055663798901e-07, 1.804917912653148e-07, 1.775106727134789e-07, 1.74714414392552e-07, 1.71937908980134e-07, 1.691778400279149e-07, 1.664876798846204e-07, 1.638627623636882e-07, 1.61410499466777e-07, 1.590313584599997e-07, 1.56682813459889e-07, 1.543546964335011e-07, 1.521740955467976e-07]
+err_der_m_flow=[-2.569559148790646e-17, 6.223596143632637e-09, 6.704815706268598e-09, 9.860186774199949e-09, 1.330702828519459e-08, 1.521627250348673e-08, 1.693042102869794e-08, 1.87990564426722e-08, 2.113110702000814e-08, 2.38006864376788e-08, 2.590343130065877e-08, 2.674190727908467e-08, 2.778325602969747e-08, 2.880640328908425e-08, 3.058056353550069e-08, 3.228030329535076e-08, 3.376114051314911e-08, 3.517930807197764e-08, 3.760673775085124e-08, 3.995444046650487e-08, 4.244194160939894e-08, 4.528096981055615e-08, 5.027926529722771e-08, 5.520381918073164e-08, 4.656451486156395e-08, 5.857907936501761e-08, 6.772274439849298e-08, 5.512234825626151e-08, 4.592460549809672e-08, 3.975024022374391e-08, 3.546352096318459e-08, 3.273033807656675e-08, 3.09428100484624e-08, 1.642532175176875e-08, 8.06574571502213e-09, 3.612056941983318e-09, 1.531584351992111e-09, -7.888446390308087e-10, -9.383131482325568e-10, 1.520570398851312e-08, 3.713927642475279e-08, 4.988006142331449e-08, 6.271126286843966e-08, 7.278600856143778e-08, 8.116954472028059e-08, 8.735312245308369e-08, 9.179040432743296e-08, 9.471910531606782e-08, 9.646138460549255e-08, 9.731217430533882e-08, 9.752786667149849e-08, 9.703644110795507e-08, 9.838930052384636e-08, 1.089526842114193e-07, 1.252100797939627e-07, 1.411092104484465e-07, 1.62503444021178e-07, 1.839888165183149e-07, 2.053057710993625e-07, 2.273980827183634e-07, 2.418114463560365e-07, 2.492034812545289e-07, 2.515122044533496e-07, 2.520939400584342e-07, 2.512637422911781e-07, 2.487588540698773e-07, 2.43402551531745e-07, 2.327325494670494e-07, 2.012416130482874e-07, 1.64250025533065e-07, 1.267315174547391e-07, 9.131444401364341e-08, 5.461104791837953e-08, 3.321702577967142e-08, -6.042430980255776e-10, -6.028007959457682e-08, -8.95977607315575e-08, -8.726648473262418e-08, -7.345643518910902e-08, -6.589683093910894e-08, -6.640249556247023e-08, -6.978341761352829e-08, -7.226422205396897e-08, -7.338794437927334e-08, -7.405905216465482e-08, -7.377123958171342e-08, -7.243120240528936e-08, -6.771343194533249e-08, -6.469971069359905e-08, -6.222856246816285e-08, -6.055199075636986e-08, -5.940748654602962e-08, -5.826438502952096e-08, -5.704707933946793e-08, -5.587627396239395e-08, -5.475882105892248e-08, -5.40404811739145e-08, -5.347274970119197e-08, -5.294206950353216e-08, -5.241424022871264e-08, -5.22151140103233e-08]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_BasicFlowFunction_m_flow_DerivativeCheck.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_BasicFlowFunction_m_flow_DerivativeCheck.txt
new file mode 100644
index 00000000..1f44bb99
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_BasicFlowFunction_m_flow_DerivativeCheck.txt
@@ -0,0 +1,11 @@
+last-generated=2017-05-01
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "1",
+ "linear": " "
+}
+dp_comp=[-8.163265228271484e+00, -7.839999848035112e+00, -7.52326569880074e+00, -7.213061369370261e+00, -6.909387338367135e+00, -6.612245433962101e+00, -6.321632930755501e+00, -6.037550725820503e+00, -5.760000589406794e+00, -5.48897991242635e+00, -5.224489533561754e+00, -4.966531165140792e+00, -4.715102314384226e+00, -4.47020376158776e+00, -4.231836460425709e+00, -4.000000136628564e+00, -3.774693886737385e+00, -3.555918173380634e+00, -3.343673617577091e+00, -3.137959193755177e+00, -2.938775306623444e+00, -2.746122518811794e+00, -2.559999921059147e+00, -2.380407860153709e+00, -2.207347078751253e+00, -2.040816307067871e+00, -1.880816424875724e+00, -1.727346834727816e+00, -1.580408232727742e+00, -1.440000147566247e+00, -1.306122383487605e+00, -1.178775578673932e+00, -1.057959115342611e+00, -9.43757991182175e-01, -8.365455642920191e-01, -7.366496947950356e-01, -6.442642755604454e-01, -5.594566854381986e-01, -4.821770092454787e-01, -4.122660796057421e-01, -3.494639905268054e-01, -2.934184483850213e-01, -2.436931813922197e-01, -1.997762161290242e-01, -1.610885460780004e-01, -1.269922679930756e-01, -9.679918248692961e-02, -6.977901036583006e-02, -4.516792776444648e-02, -2.217690138225688e-02, -9.939294189943715e-08, 2.217670207922592e-02, 4.516773032405983e-02, 6.977881665073205e-02, 9.679898132125365e-02, 1.269920742779775e-01, 1.610883374617438e-01, 1.997760075127672e-01, 2.436929727759627e-01, 2.934182397688175e-01, 3.494637819105487e-01, 4.122658709894854e-01, 4.82176800629222e-01, 5.594565066242644e-01, 6.442640371418841e-01, 7.366495159809237e-01, 8.365453854780853e-01, 9.437578123682412e-01, 1.057958996133322e+00, 1.178775459464642e+00, 1.306122383487427e+00, 1.440000028356957e+00, 1.580408113518523e+00, 1.727346834727816e+00, 1.880816305666435e+00, 2.040816307067871e+00, 2.207347078751253e+00, 2.380407860153709e+00, 2.559999921059147e+00, 2.746122518811794e+00, 2.938775306623445e+00, 3.137958955336884e+00, 3.343673617576237e+00, 3.555917934963619e+00, 3.774693648319232e+00, 4.000000136628564e+00, 4.231836460425709e+00, 4.47020376158776e+00, 4.715102314384226e+00, 4.966530688307045e+00, 5.224489533560333e+00, 5.488979435590045e+00, 5.760000112572764e+00, 6.037550725820505e+00, 6.321632453918342e+00, 6.612244957127783e+00, 6.909387338367134e+00, 7.213061369370261e+00, 7.52326569880074e+00, 7.839999848035112e+00, 8.163265228271484e+00]
+dp=[-8.163265228271484e+00, -7.839999848035112e+00, -7.52326569880074e+00, -7.213061369370261e+00, -6.909387338367135e+00, -6.612245433962101e+00, -6.321632930755501e+00, -6.037550725820503e+00, -5.760000589406794e+00, -5.48897991242635e+00, -5.224489533561754e+00, -4.966531165140792e+00, -4.715102314384226e+00, -4.47020376158776e+00, -4.231836460425709e+00, -4.000000136628564e+00, -3.774693886737385e+00, -3.555918173380634e+00, -3.343673617577091e+00, -3.137959193755177e+00, -2.938775306623444e+00, -2.746122518811794e+00, -2.559999921059147e+00, -2.380407860153709e+00, -2.207347078751253e+00, -2.040816307067871e+00, -1.880816424875724e+00, -1.727346834727816e+00, -1.580408232727742e+00, -1.440000147566247e+00, -1.306122383487605e+00, -1.178775578673932e+00, -1.057959115342611e+00, -9.437579315775302e-01, -8.365455046873743e-01, -7.366495755857461e-01, -6.442641563511559e-01, -5.594565662290512e-01, -4.821768900361891e-01, -4.122659603964525e-01, -3.49463901119816e-01, -2.934183589780541e-01, -2.436930770841046e-01, -1.997761118208958e-01, -1.61088441769872e-01, -1.269921785861029e-01, -9.679908562937851e-02, -6.977891350827981e-02, -4.516783090689789e-02, -2.217680079941903e-02, 0e+00, 2.217680079941903e-02, 4.516783090689789e-02, 6.977891350827981e-02, 9.679908562937868e-02, 1.269921785861031e-01, 1.610884417698722e-01, 1.997761118208956e-01, 2.436930770841043e-01, 2.934183589780538e-01, 3.49463901119816e-01, 4.122659603964525e-01, 4.821768900361891e-01, 5.594565662290513e-01, 6.442641563511559e-01, 7.366495755857461e-01, 8.365455046873749e-01, 9.437579315775307e-01, 1.057959115342612e+00, 1.178775578673931e+00, 1.306122383487604e+00, 1.440000147566246e+00, 1.580408232727742e+00, 1.727346834727816e+00, 1.880816424875724e+00, 2.040816307067871e+00, 2.207347078751253e+00, 2.380407860153709e+00, 2.559999921059147e+00, 2.746122518811794e+00, 2.938775306623445e+00, 3.137959193755179e+00, 3.343673617577089e+00, 3.555918173380634e+00, 3.774693886737385e+00, 4.000000136628564e+00, 4.231836460425709e+00, 4.47020376158776e+00, 4.715102314384226e+00, 4.966531165140792e+00, 5.224489533561754e+00, 5.48897991242635e+00, 5.760000589406796e+00, 6.037550725820505e+00, 6.3216329307555e+00, 6.612245433962099e+00, 6.909387338367134e+00, 7.213061369370261e+00, 7.52326569880074e+00, 7.839999848035112e+00, 8.163265228271484e+00]
+time=[-2e+00, 2e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_BasicFlowFunction_m_flow_DerivativeCheck2.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_BasicFlowFunction_m_flow_DerivativeCheck2.txt
new file mode 100644
index 00000000..97c6a8a9
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_BasicFlowFunction_m_flow_DerivativeCheck2.txt
@@ -0,0 +1,15 @@
+last-generated=2017-05-01
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "2",
+ "linear": " "
+}
+dp_comp=[-8.163265228271484e+00, -7.231365321650957e+00, -6.389860542280423e+00, -5.631589976145897e+00, -4.949836198023491e+00, -4.338294726492856e+00, -3.791053896634853e+00, -3.302589329123385e+00, -2.867739505819975e+00, -2.481687200414361e+00, -2.139950801726897e+00, -1.838364653313783e+00, -1.573060870966329e+00, -1.340461151859622e+00, -1.137257547002805e+00, -9.604527156482561e-01, -8.079889516962672e-01, -6.780033955084965e-01, -5.681861178944496e-01, -4.760531884160856e-01, -3.991469814731046e-01, -3.351581293808927e-01, -2.819946351645913e-01, -2.378144585380795e-01, -2.010313151246572e-01, -1.703043282032013e-01, -1.445188651307841e-01, -1.227609358570169e-01, -1.042907258638002e-01, -8.851567882264387e-02, -7.496567446427121e-02, -6.327044481707311e-02, -5.313954209897102e-02, -4.434553761944973e-02, -3.670961667619785e-02, -3.008993539978234e-02, -2.437221227768491e-02, -1.946220207843118e-02, -1.527997118015002e-02, -1.175551042866212e-02, -8.825493589106672e-03, -6.430944143139244e-03, -4.51560675490163e-03, -3.024838361599425e-03, -1.904909863838194e-03, -1.102561316628315e-03, -5.647588220337309e-04, -2.385605064280261e-04, -7.105797498028435e-05, -9.35149527184602e-06, -5.42976295037079e-07, 8.265566783382476e-06, 6.997211834190611e-05, 2.374748607924382e-04, 5.636739476498102e-04, 1.101478421304533e-03, 1.903829296821314e-03, 3.023761752703024e-03, 4.514534802619071e-03, 6.429877778789632e-03, 8.824433744016065e-03, 1.175445803415364e-02, 1.527892903019277e-02, 1.946117203567254e-02, 2.437119341078772e-02, 3.008892770875105e-02, 3.670862202369486e-02, 4.434455786810128e-02, 5.313858097406075e-02, 6.326949859334613e-02, 7.496475059226602e-02, 8.851476985181098e-02, 1.042898243435524e-01, 1.227600492379259e-01, 1.445179859622737e-01, 1.703034639358521e-01, 2.010304657583981e-01, 2.378136091718915e-01, 2.819938006995644e-01, 3.351572949158659e-01, 3.991461172057558e-01, 4.760523241487724e-01, 5.68185283429209e-01, 6.780025014388249e-01, 8.079880576265955e-01, 9.604518215784068e-01, 1.137256712536926e+00, 1.340460317394595e+00, 1.573060036501017e+00, 1.838363699639467e+00, 2.139950086470449e+00, 2.481686485158197e+00, 2.867738790562677e+00, 3.302588613866797e+00, 3.791052942960534e+00, 4.338293772821379e+00, 4.949835244349171e+00, 5.631589499308454e+00, 6.389859588608664e+00, 7.231364844811525e+00, 8.163264274597168e+00]
+dp=[-8.163265228271484e+00, -7.231365321650957e+00, -6.389860542280423e+00, -5.631589976145897e+00, -4.949836198023491e+00, -4.338294726492856e+00, -3.791053896634853e+00, -3.302589329123385e+00, -2.867739505819975e+00, -2.481687200414361e+00, -2.139950801726187e+00, -1.838364534104494e+00, -1.573060751757039e+00, -1.340461032650333e+00, -1.137257427793516e+00, -9.604525368343217e-01, -8.079887728823328e-01, -6.780032166945622e-01, -5.681859390805153e-01, -4.760529797998644e-01, -3.991467728568479e-01, -3.35157920764636e-01, -2.819943967460122e-01, -2.378142201194205e-01, -2.010310618049169e-01, -1.703040599822998e-01, -1.445185969098826e-01, -1.227606527349542e-01, -1.042904278405763e-01, -8.851536589828322e-02, -7.496535408929444e-02, -6.327010209037454e-02, -5.313918447108904e-02, -4.434516136512626e-02, -3.670922179543953e-02, -3.008952934313425e-02, -2.437179318252577e-02, -1.94617736700513e-02, -1.527953066457597e-02, -1.175505966853684e-02, -8.825032584431543e-03, -6.430474756558307e-03, -4.515128055099943e-03, -3.024351279892659e-03, -1.904414400229592e-03, -1.102057820360785e-03, -5.64247234902691e-04, -2.380410030549003e-04, -7.053062084871561e-05, -8.816327671119111e-06, -3.705769144237564e-22, 8.81632767111911e-06, 7.053062084871561e-05, 2.380410030549003e-04, 5.642472349026934e-04, 1.102057820360788e-03, 1.904414400229597e-03, 3.024351279892652e-03, 4.515128055099933e-03, 6.430474756558295e-03, 8.825032584431543e-03, 1.175505966853684e-02, 1.527953066457597e-02, 1.94617736700513e-02, 2.437179318252577e-02, 3.008952934313425e-02, 3.670922179543958e-02, 4.43451613651263e-02, 5.31391844710891e-02, 6.327010209037448e-02, 7.496535408929438e-02, 8.851536589828315e-02, 1.042904278405763e-01, 1.227606527349542e-01, 1.445185969098826e-01, 1.703040599822998e-01, 2.010310618049169e-01, 2.378142201194205e-01, 2.819943967460122e-01, 3.35157920764636e-01, 3.991467728568483e-01, 4.760529797998649e-01, 5.681859390805147e-01, 6.780032166945622e-01, 8.079887728823328e-01, 9.604525368343217e-01, 1.137257427793516e+00, 1.340461032650333e+00, 1.573060751757039e+00, 1.838364534104494e+00, 2.139950801726187e+00, 2.481687200414361e+00, 2.867739505819978e+00, 3.302589329123387e+00, 3.79105389663485e+00, 4.338294726492853e+00, 4.949836198023488e+00, 5.631589976145897e+00, 6.389860542280423e+00, 7.231365321650957e+00, 8.163265228271484e+00]
+time=[-2e+00, 2e+00]
+der(dp_comp)=[2.448979568481445e+01, 2.213683296156774e+01, 1.996831356011351e+01, 1.797316001991906e+01, 1.614077041451297e+01, 1.446098139419446e+01, 1.29240468697678e+01, 1.152066040477268e+01, 1.02419268536951e+01, 9.079343241962295e+00, 8.024815921115257e+00, 7.070632337331364e+00, 6.209450161780181e+00, 5.434301506773428e+00, 4.738572620111948e+00, 4.109337218596576e+00, 3.521673480002339e+00, 2.987347187759938e+00, 2.513955913772723e+00, 2.102978378688487e+00, 1.751979807648551e+00, 1.456195703215802e+00, 1.209654901051021e+00, 1.005957290267101e+00, 8.387812056799229e-01, 7.022010087966919e-01, 5.908694816622799e-01, 5.000974797116362e-01, 4.258721552442044e-01, 3.648298753027227e-01, 3.142042620774025e-01, 2.717609201971122e-01, 2.3572581148427e-01, 2.047151276193496e-01, 1.77668476344011e-01, 1.537885682261318e-01, 1.324881005316303e-01, 1.133438212804201e-01, 9.605817196874529e-02, 8.042781144407879e-02, 6.631812256003153e-02, 5.364330062062023e-02, 4.235103173512845e-02, 3.24110907573522e-02, 2.380717281470991e-02, 1.65311782448695e-02, 1.057952411523568e-02, 5.950837670986949e-03, 2.644703381976971e-03, 6.610294547049776e-04, -1.944483045689149e-07, 6.610306188581959e-04, 2.644705011791581e-03, 5.950843258922708e-03, 1.05795427416897e-02, 1.653121922306143e-02, 2.380722496877538e-02, 3.241116153786754e-02, 4.235112486738919e-02, 5.364340865403882e-02, 6.631825667047672e-02, 8.042796045569295e-02, 9.605834333210901e-02, 1.13344022446114e-01, 1.324883240490482e-01, 1.537888066446665e-01, 1.776687296637249e-01, 2.047153958402512e-01, 2.357260946062796e-01, 2.717612182203359e-01, 3.142045601005817e-01, 3.648301435236239e-01, 4.258724532674282e-01, 5.000977181302775e-01, 5.908697796855038e-01, 7.022013068199158e-01, 8.387813844938572e-01, 1.00595740947671e+00, 1.209655139469529e+00, 1.456195822425092e+00, 1.751979807648553e+00, 2.102978378688489e+00, 2.513955675354994e+00, 2.987346949341359e+00, 3.52167324158376e+00, 4.109336741759417e+00, 4.7385721432782e+00, 5.43430102993627e+00, 6.209449684943023e+00, 7.070631860497617e+00, 8.024814967442362e+00, 9.079343241962295e+00, 1.024192590002704e+01, 1.152066040477268e+01, 1.292404686976666e+01, 1.446098139418876e+01, 1.614077041450899e+01, 1.797316001991906e+01, 1.996831356011351e+01, 2.213683296156774e+01, 2.448979568481445e+01]
+der(dp)=[2.448979568481445e+01, 2.213683296156774e+01, 1.996831356011351e+01, 1.797316001991906e+01, 1.614077041451297e+01, 1.446098139419446e+01, 1.29240468697678e+01, 1.152066040477608e+01, 1.024192685370135e+01, 9.079343241962295e+00, 8.024815921115257e+00, 7.070632337334775e+00, 6.209450161780181e+00, 5.434301506773428e+00, 4.738573096949106e+00, 4.109337218597997e+00, 3.521673718420918e+00, 2.987347426178517e+00, 2.513956152191302e+00, 2.102978617107066e+00, 1.75198004606713e+00, 1.456196060843174e+00, 1.2096551394696e+00, 1.00595752868568e+00, 8.38781444098502e-01, 7.022013068199158e-01, 5.908697796855038e-01, 5.000977777348601e-01, 4.258724532674282e-01, 3.648301733259466e-01, 3.142045601006264e-01, 2.717612480226585e-01, 2.357261095074406e-01, 2.047154107414123e-01, 1.776687445649125e-01, 1.537888215458721e-01, 1.324883538513661e-01, 1.133440522484364e-01, 9.605839548617319e-02, 8.042802751091832e-02, 6.631833862686329e-02, 5.364350923687695e-02, 4.235123662609819e-02, 3.241129564831834e-02, 2.380737398038603e-02, 1.653137754789977e-02, 1.057972062429893e-02, 5.951033714388905e-03, 2.644898494056405e-03, 6.612245085766986e-04, 1.389134033497053e-19, 6.612245085766986e-04, 2.644898494056405e-03, 5.951033714388904e-03, 1.057972062429896e-02, 1.653137754789981e-02, 2.380737398038607e-02, 3.241129564831829e-02, 4.235123662609814e-02, 5.364350923687688e-02, 6.631833862686329e-02, 8.042802751091832e-02, 9.605839548617319e-02, 1.133440522484364e-01, 1.324883538513661e-01, 1.537888215458721e-01, 1.776687445649127e-01, 2.047154107414124e-01, 2.357261095074408e-01, 2.717612480226583e-01, 3.142045601006261e-01, 3.648301733259463e-01, 4.258724532674282e-01, 5.000977777348601e-01, 5.908697796855038e-01, 7.022013068199158e-01, 8.38781444098502e-01, 1.00595752868568e+00, 1.2096551394696e+00, 1.456196060843174e+00, 1.751980046067132e+00, 2.102978617107068e+00, 2.5139561521913e+00, 2.987347426178517e+00, 3.521673718420918e+00, 4.109337218597997e+00, 4.738573096949106e+00, 5.434301506773428e+00, 6.209450161780181e+00, 7.070632337334775e+00, 8.024815921115257e+00, 9.079343241962295e+00, 1.024192685370136e+01, 1.152066040477609e+01, 1.292404686976779e+01, 1.446098139419445e+01, 1.614077041451296e+01, 1.797316001991906e+01, 1.996831356011351e+01, 2.213683296156774e+01, 2.448979568481445e+01]
+err_dp=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+err_der_dp=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_InverseFlowFunctions.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_InverseFlowFunctions.txt
deleted file mode 100644
index aa8f8cd4..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_InverseFlowFunctions.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-last-generated=2017-05-01
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-m_flow_nominal=[1e+00, 1e+00]
-m_flow=[-1.1180340051651e+00, -1.106797218070049e+00, -1.095445155586754e+00, -1.083974122227039e+00, -1.072380541711855e+00, -1.060660124702194e+00, -1.048808811494933e+00, -1.036822080971061e+00, -1.024695036611623e+00, -1.012422804474204e+00, -1.000000001860286e+00, -9.874208561971487e-01, -9.746794070132533e-01, -9.617692170073281e-01, -9.486833222602427e-01, -9.35414381828286e-01, -9.219544481355398e-01, -9.082950974240113e-01, -8.944271902706984e-01, -8.8034081119968e-01, -8.660253925352369e-01, -8.514693282982595e-01, -8.366600257197626e-01, -8.215838138047729e-01, -8.06225768339206e-01, -7.905694246292114e-01, -7.74596675709435e-01, -7.582875666664675e-01, -7.416198273678803e-01, -7.245688294113473e-01, -7.071067901059394e-01, -6.892024321769182e-01, -6.708204016547072e-01, -6.519202840681533e-01, -6.324555348287361e-01, -6.123724457734773e-01, -5.916080179984207e-01, -5.700877412999505e-01, -5.47722567120723e-01, -5.244043722927768e-01, -5.000000148273981e-01, -4.743416512607383e-01, -4.472135532612322e-01, -4.183300349737916e-01, -3.872983378056546e-01, -3.535533419655873e-01, -3.162277964740148e-01, -2.72744261815865e-01, -2.079204472856317e-01, -1.136482237922434e-01, 0e+00, 1.13648223790757e-01, 2.079206830187468e-01, 2.727444076443231e-01, 3.162276779863524e-01, 3.535533419662219e-01, 3.872983378055392e-01, 4.183300349734752e-01, 4.47213636504362e-01, 4.743417294685148e-01, 4.99999940095156e-01, 5.244043722932872e-01, 5.477225671208859e-01, 5.700877412997953e-01, 5.916080179979719e-01, 6.12372506486199e-01, 6.324554757867977e-01, 6.51920226904483e-01, 6.708204016549065e-01, 6.892024321769824e-01, 7.07106790105626e-01, 7.245688807713863e-01, 7.416197770314393e-01, 7.582875175088124e-01, 7.745966757096648e-01, 7.905694246292114e-01, 8.062257914298019e-01, 8.215838364341934e-01, 8.366600701716206e-01, 8.514693063851921e-01, 8.660253710061814e-01, 8.803408111996295e-01, 8.944271902705496e-01, 9.082951178996933e-01, 9.219544884964919e-01, 9.354143419689933e-01, 9.486833026011607e-01, 9.617692170074206e-01, 9.746794165649068e-01, 9.874208750383738e-01, 1.000000029764131e+00, 1.012422767645555e+00, 1.024695018413187e+00, 1.036822071979234e+00, 1.048808815933463e+00, 1.060660137858765e+00, 1.072380567739518e+00, 1.083974089975063e+00, 1.095445134309698e+00, 1.106797207540877e+00, 1.1180340051651e+00]
-time=[0e+00, 1e+00]
-dpCalc=[-5e+00, -4.90000009313226e+00, -4.80000018626452e+00, -4.699999802559628e+00, -4.599999895691882e+00, -4.500000007450573e+00, -4.400000081956401e+00, -4.300000193715098e+00, -4.199999791383797e+00, -4.099999940395248e+00, -4.000000014901117e+00, -3.900000089406985e+00, -3.799999925494274e+00, -3.700000000000142e+00, -3.599999910593015e+00, -3.500000059604467e+00, -3.400000059604751e+00, -3.299999970197624e+00, -3.200000119209077e+00, -3.099999880790782e+00, -3.000000029802234e+00, -2.900000029802518e+00, -2.799999940395391e+00, -2.700000089406843e+00, -2.599999850988548e+00, -2.5e+00, -2.400000000000284e+00, -2.300000059604325e+00, -2.200000059604609e+00, -2.099999821186314e+00, -2.000000119208934e+00, -1.899999999999929e+00, -1.799999880790923e+00, -1.700000178813543e+00, -1.600000059604538e+00, -1.499999940395533e+00, -1.400000119208863e+00, -1.300000000000142e+00, -1.199999999999858e+00, -1.099999880791137e+00, -1.000000059604467e+00, -8.999999403954621e-01, -7.999998807907106e-01, -7.000000596046448e-01, -6e-01, -4.99999880790888e-01, -4.000000894067183e-01, -2.976776524486368e-01, -1.762541091178677e-01, -6.546933150224038e-02, 0e+00, 6.546933150091615e-02, 1.762544837880112e-01, 2.976779744541962e-01, 3.999997913872608e-01, 4.999998807926648e-01, 5.999999999996453e-01, 7.000000596035785e-01, 8.000001788109496e-01, 9.000002384146709e-01, 9.999997615856838e-01, 1.099999880793268e+00, 1.200000000000568e+00, 1.299999999999432e+00, 1.400000119206732e+00, 1.500000238414316e+00, 1.599999761586111e+00, 1.6999998807927e+00, 1.79999988079199e+00, 1.900000000000284e+00, 2.000000119207157e+00, 2.100000119205452e+00, 2.199999761586537e+00, 2.299999761584831e+00, 2.400000000001705e+00, 2.5e+00, 2.599999999998295e+00, 2.700000238415169e+00, 2.800000238413463e+00, 2.899999880794548e+00, 2.999999880792843e+00, 3.099999880790427e+00, 3.20000011920801e+00, 3.300000119206305e+00, 3.400000357623179e+00, 3.499999761585684e+00, 3.599999761583978e+00, 3.700000000000852e+00, 3.799999999999148e+00, 3.900000238416022e+00, 4.000000238414316e+00, 4.099999642376821e+00, 4.199999642375116e+00, 4.300000119210569e+00, 4.400000119209573e+00, 4.500000119207158e+00, 4.600000119205452e+00, 4.699999523167957e+00, 4.80000000000341e+00, 4.900000000001705e+00, 5e+00]
-dp=[-5e+00, -4.90000009313226e+00, -4.80000018626452e+00, -4.699999802559628e+00, -4.599999895691882e+00, -4.500000007450573e+00, -4.400000081956401e+00, -4.300000193715098e+00, -4.199999791383797e+00, -4.099999940395248e+00, -4.000000014901117e+00, -3.900000089406985e+00, -3.799999925494274e+00, -3.700000000000142e+00, -3.599999910593015e+00, -3.500000059604467e+00, -3.400000059604751e+00, -3.299999970197624e+00, -3.200000119209077e+00, -3.099999880790782e+00, -3.000000029802234e+00, -2.900000029802518e+00, -2.799999940395391e+00, -2.700000089406843e+00, -2.599999850988548e+00, -2.5e+00, -2.400000000000284e+00, -2.300000059604325e+00, -2.200000059604609e+00, -2.099999821186314e+00, -2.000000119208934e+00, -1.899999999999929e+00, -1.799999880790923e+00, -1.700000178813543e+00, -1.600000059604538e+00, -1.499999940395533e+00, -1.400000119208863e+00, -1.300000000000142e+00, -1.199999999999858e+00, -1.099999880791137e+00, -1.000000059604467e+00, -8.999999403954621e-01, -7.999998807907106e-01, -7.000000596046448e-01, -6e-01, -4.99999880790888e-01, -4.000000894067183e-01, -3.00000000000018e-01, -1.999998956921116e-01, -1.000000968573347e-01, 0e+00, 1.000000968559136e-01, 2.000001937118273e-01, 3.000002980181083e-01, 3.999997913872608e-01, 4.999998807926648e-01, 5.999999999996453e-01, 7.000000596035785e-01, 8.000001788109496e-01, 9.000002384146709e-01, 9.999997615856838e-01, 1.099999880793268e+00, 1.200000000000568e+00, 1.299999999999432e+00, 1.400000119206732e+00, 1.500000238414316e+00, 1.599999761586111e+00, 1.6999998807927e+00, 1.79999988079199e+00, 1.900000000000284e+00, 2.000000119207157e+00, 2.100000119205452e+00, 2.199999761586537e+00, 2.299999761584831e+00, 2.400000000001705e+00, 2.5e+00, 2.599999999998295e+00, 2.700000238415169e+00, 2.800000238413463e+00, 2.899999880794548e+00, 2.999999880792843e+00, 3.099999880790427e+00, 3.20000011920801e+00, 3.300000119206305e+00, 3.400000357623179e+00, 3.499999761585684e+00, 3.599999761583978e+00, 3.700000000000852e+00, 3.799999999999148e+00, 3.900000238416022e+00, 4.000000238414316e+00, 4.099999642376821e+00, 4.199999642375116e+00, 4.300000119210569e+00, 4.400000119209573e+00, 4.500000119207158e+00, 4.600000119205452e+00, 4.699999523167957e+00, 4.80000000000341e+00, 4.900000000001705e+00, 5e+00]
-deltaDp=[4.85722573273506e-16, -3.538835439274597e-16, -5.065389336449991e-16, -7.806283908177122e-17, 6.635312935465441e-16, -7.979727246323355e-16, 3.478114965508894e-16, -5.143453308442857e-16, 5.785301035919877e-16, -7.559044479726666e-16, 2.846658750526611e-22, -1.077696099313744e-16, -2.647623813546535e-16, 1.576417313295924e-16, 1.155759402132446e-16, -1.049497208133205e-16, 2.4242687526536e-16, -1.517847466323356e-17, -3.432582674469848e-16, -4.271734277460272e-17, -3.475945877136168e-16, -3.144174414680637e-16, 2.760375458621425e-16, -1.183952350549295e-16, 2.912153396537143e-16, 3.016250443854673e-16, 2.576043806428974e-16, -1.5439040215736e-16, -2.398251830906445e-16, 1.459340349240389e-16, 2.73432709244238e-16, -1.040831715201443e-16, 2.334277956088645e-16, 2.635692083416291e-16, -1.257669351507336e-16, 1.784593173159146e-16, -1.972145543474782e-16, 1.20020455161615e-16, -1.266349429930158e-16, -1.567749881663528e-16, -5.198948841661059e-22, 4.027799981416111e-17, 1.735087790136764e-18, -4.201236404890964e-17, 6.44014855504086e-17, 2.236142246162436e-17, -6.085071427515852e-17, -2.32234033363783e-03, -2.374579029946427e-02, -3.453076535511206e-02, 0e+00, 3.453076535501524e-02, 2.374571364912412e-02, 2.322316346267882e-03, 5.423730528082709e-17, 6.169049099415658e-17, -2.526197840981966e-17, 3.984460509476669e-17, 3.89233619176369e-17, -4.027647931556637e-17, 1.308603428003022e-21, 1.567749881759784e-16, 1.266349429910899e-16, -1.200204551724231e-16, 1.972145543746102e-16, -5.62666096050955e-17, 2.301737924861772e-16, -1.76506012935944e-16, -1.630630629964216e-16, 1.580764359581854e-16, -1.322685421346726e-17, 5.334545947578566e-17, 2.398266992662146e-16, 1.543901742986169e-16, -2.576043806735268e-16, -3.016250443854673e-16, -2.912139718118728e-16, -1.671823640902893e-16, 1.680525526701718e-16, 2.164542510864577e-18, 2.255031306928713e-17, -2.951191220340628e-16, -6.939043569364795e-18, 9.649065495847579e-17, 1.32486721803598e-16, 1.049484904186245e-16, -1.155757499650933e-16, -1.576417313484353e-16, 2.647620025027422e-16, -3.252614086031007e-16, 6.033146471018698e-21, -1.543910945214704e-16, -5.785212284846303e-16, -4.393162139763136e-16, -3.478124260674424e-16, -1.981933694464092e-16, -6.63521609694645e-16, -8.100910979128272e-16, 5.065355947729728e-16, 3.538816618010643e-16, -4.85722573273506e-16]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_InvertingBasicFlowFunction_dp.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_InvertingBasicFlowFunction_dp.txt
new file mode 100644
index 00000000..4772c792
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_InvertingBasicFlowFunction_dp.txt
@@ -0,0 +1,11 @@
+last-generated=2017-05-01
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "0",
+ "linear": " "
+}
+m_flow_nominal=[1.5e+00, 1.5e+00]
+m_flow=[-2e+00, -1.960000037252901e+00, -1.919999955296513e+00, -1.879999992549417e+00, -1.840000029802316e+00, -1.799999955296522e+00, -1.759999985098829e+00, -1.720000029802327e+00, -1.679999940395462e+00, -1.64e+00, -1.600000029802322e+00, -1.559999940395391e+00, -1.519999970197678e+00, -1.48e+00, -1.440000059604609e+00, -1.4e+00, -1.36e+00, -1.320000059604538e+00, -1.28e+00, -1.24e+00, -1.200000059604467e+00, -1.159999940395355e+00, -1.12e+00, -1.080000059604645e+00, -1.039999940395355e+00, -1e+00, -9.599999403956394e-01, -9.20000059604325e-01, -8.799999999999999e-01, -8.39999940395604e-01, -8.000000596046448e-01, -7.6e-01, -7.2e-01, -6.800000596046447e-01, -6.399999999999999e-01, -6.000000000000001e-01, -5.600000596046448e-01, -5.2e-01, -4.799999701977486e-01, -4.399999403955683e-01, -4.000000298022335e-01, -3.600000000000001e-01, -3.199999403955507e-01, -2.800000298022158e-01, -2.399999850988566e-01, -1.999999552966052e-01, -1.600000298022601e-01, -1.199999925494328e-01, -7.999995529659643e-02, -4.000003725283197e-02, 0e+00, 4.000003725226355e-02, 8.000007450452709e-02, 1.200001117568972e-01, 1.599999105944718e-01, 1.99999955297316e-01, 2.399999850987147e-01, 2.800000298017893e-01, 3.200000596036499e-01, 3.600001192073355e-01, 3.999999105944538e-01, 4.39999940396421e-01, 4.799999701980329e-01, 5.199999999997158e-01, 5.600000596037922e-01, 6.00000119207158e-01, 6.399998807930554e-01, 6.799999403963501e-01, 7.200000000004265e-01, 7.600000000001419e-01, 8.000000596039341e-01, 8.400000596033657e-01, 8.799998807924156e-01, 9.19999940396492e-01, 9.599999403962078e-01, 1e+00, 1.039999999999432e+00, 1.080000119208153e+00, 1.120000119207584e+00, 1.15999988079199e+00, 1.200000000000711e+00, 1.239999999999858e+00, 1.279999999999573e+00, 1.3200001192073e+00, 1.360000119207726e+00, 1.399999880792131e+00, 1.440000000000853e+00, 1.480000000000284e+00, 1.519999999999716e+00, 1.559999999999147e+00, 1.600000119207869e+00, 1.639999880792274e+00, 1.6799998807927e+00, 1.720000000000427e+00, 1.760000000000142e+00, 1.799999999999289e+00, 1.84000011920801e+00, 1.879999880792416e+00, 1.919999880791847e+00, 1.960000000000568e+00, 2e+00]
+time=[0e+00, 1e+00]
+dp=[-1.6e+01, -1.536639975102424e+01, -1.474559971929563e+01, -1.413759990481388e+01, -1.3542400307579e+01, -1.296000008115754e+01, -1.23903998575021e+01, -1.183360006069191e+01, -1.128960027641269e+01, -1.075840015151944e+01, -1.023999984760296e+01, -9.734399765854054e+00, -9.241599906502083e+00, -8.761599315492733e+00, -8.294400242690926e+00, -7.840000420378115e+00, -7.398399674683136e+00, -6.969600276412694e+00, -6.553600128326567e+00, -6.150400067444102e+00, -5.760000343703888e+00, -5.382399793319715e+00, -5.017600016937338e+00, -4.66559996772735e+00, -4.326399625321519e+00, -4e+00, -3.686399644928906e+00, -3.385600407255974e+00, -3.097600016937195e+00, -2.822399869843023e+00, -2.560000249480428e+00, -2.310400067443818e+00, -2.073599889907987e+00, -1.849600244483597e+00, -1.638400032310364e+00, -1.439999943542378e+00, -1.254400273055342e+00, -1.081600030746481e+00, -9.215999115373329e-01, -7.74404147503481e-01, -6.404801776034726e-01, -5.208623609201753e-01, -4.160419934543136e-01, -3.259034462360318e-01, -2.497909204590814e-01, -1.865774320172134e-01, -1.347313623527447e-01, -9.238346218230593e-02, -5.739532002286553e-02, -2.742613221891857e-02, 0e+00, 2.742613221851287e-02, 5.739541608069418e-02, 9.238357836791443e-02, 1.347312242045274e-01, 1.865774320182105e-01, 2.497909204588397e-01, 3.25903446235132e-01, 4.160422842991791e-01, 5.208626987989886e-01, 6.404798019815174e-01, 7.744041475064528e-01, 9.215999115384151e-01, 1.081600030745289e+00, 1.254400273051494e+00, 1.440000518028045e+00, 1.638399424866973e+00, 1.849599596450021e+00, 2.07359988991043e+00, 2.310400067444685e+00, 2.560000249475857e+00, 2.822400672596268e+00, 3.097599181228521e+00, 3.385599530954009e+00, 3.686399644933253e+00, 4e+00, 4.326400121761317e+00, 4.665600484607864e+00, 5.017601088546461e+00, 5.382399242107818e+00, 5.75999977265007e+00, 6.150400067442699e+00, 6.553600128322185e+00, 6.969600907732309e+00, 7.398400974559598e+00, 7.839999087542148e+00, 8.294399557806841e+00, 8.761599315496088e+00, 9.24160026916131e+00, 9.734400511460695e+00, 1.024000099485668e+01, 1.075839859041758e+01, 1.128959947724471e+01, 1.183359965149526e+01, 1.239040006744554e+01, 1.296000072630449e+01, 1.354240162625268e+01, 1.413759822757126e+01, 1.474559857729561e+01, 1.536639916810064e+01, 1.6e+01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_InvertingBasicFlowFunction_m_flow.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_InvertingBasicFlowFunction_m_flow.txt
new file mode 100644
index 00000000..c4bc336c
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_BaseClasses_FlowModels_Validation_InvertingBasicFlowFunction_m_flow.txt
@@ -0,0 +1,11 @@
+last-generated=2017-05-01
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "0",
+ "linear": " "
+}
+m_flow_nominal=[5e-01, 5e-01]
+m_flow=[-7.071067690849304e-01, -6.999999879192522e-01, -6.928203102696964e-01, -6.855654711596021e-01, -6.782330267983455e-01, -6.708204155747007e-01, -6.633249511135191e-01, -6.557438375835506e-01, -6.480740890995654e-01, -6.403124360320277e-01, -6.324555289590077e-01, -6.244997973432059e-01, -6.164414264828535e-01, -6.082762440533225e-01, -6.00000024337869e-01, -5.916079929109839e-01, -5.830951898381036e-01, -5.744562760634371e-01, -5.656854573428959e-01, -5.567764618408874e-01, -5.477225807647501e-01, -5.385164557512051e-01, -5.291502464454064e-01, -5.196152369518704e-01, -5.099019355522678e-01, -5e-01, -4.898979268288228e-01, -4.795831553493763e-01, -4.690415871901311e-01, -4.582575468352034e-01, -4.472136034400493e-01, -4.358899024583438e-01, -4.242640649189326e-01, -4.123105863336887e-01, -4.000000104168907e-01, -3.872983378450542e-01, -3.741657626375923e-01, -3.605551487515166e-01, -3.464101483848905e-01, -3.316624543982284e-01, -3.162277732688553e-01, -3.000000059269625e-01, -2.828427021878686e-01, -2.645751372088027e-01, -2.449489633833608e-01, -2.236067681445503e-01, -2.000000235873864e-01, -1.73205074147548e-01, -1.412468420554324e-01, -8.67490987172134e-02, 0e+00, 8.674909871622133e-02, 1.412469525380917e-01, 1.732051589050942e-01, 1.999999486490932e-01, 2.236067681449517e-01, 2.449489633832877e-01, 2.645751372086026e-01, 2.828427548354152e-01, 3.000000553898832e-01, 3.162277260043017e-01, 3.316624543985512e-01, 3.464101483849935e-01, 3.605551487514184e-01, 3.741657626373085e-01, 3.872983762429593e-01, 3.99999973075327e-01, 4.123105501802113e-01, 4.242640649190587e-01, 4.358899024583844e-01, 4.472136034398511e-01, 4.582575793182098e-01, 4.690415553543575e-01, 4.795831242595304e-01, 4.898979268289682e-01, 5e-01, 5.099019501561327e-01, 5.196152512636755e-01, 5.291502745598089e-01, 5.385164418923946e-01, 5.477225671484545e-01, 5.567764618408555e-01, 5.656854573428017e-01, 5.744562890132801e-01, 5.830952153641427e-01, 5.916079677023451e-01, 6.000000119045157e-01, 6.082762440533809e-01, 6.164414325237914e-01, 6.244998092595946e-01, 6.324555466072408e-01, 6.40312412738729e-01, 6.480740775894327e-01, 6.557438318964942e-01, 6.633249539206876e-01, 6.70820423895228e-01, 6.782330432590439e-01, 6.855654507612724e-01, 6.928202968134715e-01, 6.9999998126025e-01, 7.071067690849304e-01]
+time=[0e+00, 1e+00]
+dp=[-2e+00, -1.960000037252901e+00, -1.919999955296513e+00, -1.879999992549417e+00, -1.840000029802316e+00, -1.799999955296522e+00, -1.759999985098829e+00, -1.720000029802327e+00, -1.679999940395462e+00, -1.64e+00, -1.600000029802322e+00, -1.559999940395391e+00, -1.519999970197678e+00, -1.48e+00, -1.440000059604609e+00, -1.4e+00, -1.36e+00, -1.320000059604538e+00, -1.28e+00, -1.24e+00, -1.200000059604467e+00, -1.159999940395355e+00, -1.12e+00, -1.080000059604645e+00, -1.039999940395355e+00, -1e+00, -9.599999403956394e-01, -9.20000059604325e-01, -8.799999999999999e-01, -8.39999940395604e-01, -8.000000596046448e-01, -7.6e-01, -7.2e-01, -6.800000596046447e-01, -6.399999999999999e-01, -6.000000000000001e-01, -5.600000596046448e-01, -5.2e-01, -4.799999701977486e-01, -4.399999403955683e-01, -4.000000298022335e-01, -3.600000000000001e-01, -3.199999403955507e-01, -2.800000298022158e-01, -2.399999850988566e-01, -1.999999552966052e-01, -1.600000298022601e-01, -1.199999925494328e-01, -7.999995529659643e-02, -4.000003725283197e-02, 0e+00, 4.000003725226355e-02, 8.000007450452709e-02, 1.200001117568972e-01, 1.599999105944718e-01, 1.99999955297316e-01, 2.399999850987147e-01, 2.800000298017893e-01, 3.200000596036499e-01, 3.600001192073355e-01, 3.999999105944538e-01, 4.39999940396421e-01, 4.799999701980329e-01, 5.199999999997158e-01, 5.600000596037922e-01, 6.00000119207158e-01, 6.399998807930554e-01, 6.799999403963501e-01, 7.200000000004265e-01, 7.600000000001419e-01, 8.000000596039341e-01, 8.400000596033657e-01, 8.799998807924156e-01, 9.19999940396492e-01, 9.599999403962078e-01, 1e+00, 1.039999999999432e+00, 1.080000119208153e+00, 1.120000119207584e+00, 1.15999988079199e+00, 1.200000000000711e+00, 1.239999999999858e+00, 1.279999999999573e+00, 1.3200001192073e+00, 1.360000119207726e+00, 1.399999880792131e+00, 1.440000000000853e+00, 1.480000000000284e+00, 1.519999999999716e+00, 1.559999999999147e+00, 1.600000119207869e+00, 1.639999880792274e+00, 1.6799998807927e+00, 1.720000000000427e+00, 1.760000000000142e+00, 1.799999999999289e+00, 1.84000011920801e+00, 1.879999880792416e+00, 1.919999880791847e+00, 1.960000000000568e+00, 2e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Examples_Carnot_TEva.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Examples_Carnot_TEva.txt
new file mode 100644
index 00000000..ade432f1
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Examples_Carnot_TEva.txt
@@ -0,0 +1,25 @@
+last-generated=2017-06-16
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": " "
+}
+chi.sta_a2.T=[2.951499938964844e+02, 2.951499938964844e+02]
+chi.sta_b2.T=[2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.851499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
+chi.TSet=[2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.851499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
+time=[0e+00, 3.6e+03]
+chi.sta_b1.T=[3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02]
+chi.sta_a1.T=[2.981499938964844e+02, 2.981499938964844e+02]
+chi.QCon_flow=[2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 1.3120746875e+05, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04]
+chi.QEva_flow=[-1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -9.9619046875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04]
+chi.P=[6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 3.1588421875e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04]
+chi.dp2=[6e+03, 6e+03]
+chi.dp1=[1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 5.66719091796875e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03]
+chi.COP_nominal=[2.85672402381897e+00, 2.85672402381897e+00]
+chi.COP=[2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 3.153656959533691e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Examples_Carnot_y.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Examples_Carnot_y.txt
new file mode 100644
index 00000000..dc8250c2
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Examples_Carnot_y.txt
@@ -0,0 +1,20 @@
+last-generated=2017-06-16
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "number of continuous time states": "2",
+ "linear": " "
+}
+chi.sta_a2.T=[2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.941499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
+chi.sta_b2.T=[2.781499938964844e+02, 2.783276672363281e+02, 2.783989868164062e+02, 2.78582275390625e+02, 2.789956359863281e+02, 2.794069213867188e+02, 2.79700927734375e+02, 2.798882141113281e+02, 2.800008239746094e+02, 2.800663146972656e+02, 2.801035461425781e+02, 2.801243896484375e+02, 2.801359252929688e+02, 2.801422729492188e+02, 2.80145751953125e+02, 2.801476440429688e+02, 2.80148681640625e+02, 2.801492309570312e+02, 2.801495361328125e+02, 2.801496887207031e+02, 2.801497802734375e+02, 2.801498107910156e+02, 2.801498413085938e+02, 2.801498718261719e+02, 2.801498718261719e+02, 2.801498718261719e+02, 2.816273803710938e+02, 2.847231140136719e+02, 2.865875244140625e+02, 2.87444580078125e+02, 2.878477478027344e+02, 2.88042236328125e+02, 2.881383361816406e+02, 2.881867370605469e+02, 2.882115173339844e+02, 2.88224365234375e+02, 2.882310791015625e+02, 2.88234619140625e+02, 2.882365112304688e+02, 2.882374877929688e+02, 2.88238037109375e+02, 2.882383117675781e+02, 2.882384643554688e+02, 2.882385559082031e+02, 2.882385864257812e+02, 2.882386169433594e+02, 2.882386169433594e+02, 2.882386474609375e+02, 2.882386474609375e+02, 2.882386474609375e+02, 2.882386474609375e+02, 2.895340270996094e+02, 2.928721618652344e+02, 2.953325805664062e+02, 2.9664599609375e+02, 2.973471374511719e+02, 2.977214050292969e+02, 2.979212036132812e+02, 2.980278625488281e+02, 2.980847778320312e+02, 2.981151733398438e+02, 2.981314086914062e+02, 2.981400756835938e+02, 2.981447143554688e+02, 2.981471557617188e+02, 2.981484680175781e+02, 2.981492004394531e+02, 2.981495666503906e+02, 2.981497802734375e+02, 2.981498718261719e+02, 2.981499328613281e+02, 2.981499633789062e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
+chi.sta_b1.T=[3.031499938964844e+02, 3.030223388671875e+02, 3.031642456054688e+02, 3.053920593261719e+02, 3.084046020507812e+02, 3.100027770996094e+02, 3.108071899414062e+02, 3.112174072265625e+02, 3.114286804199219e+02, 3.115383605957031e+02, 3.115956726074219e+02, 3.116257934570312e+02, 3.116416931152344e+02, 3.116500854492188e+02, 3.116545715332031e+02, 3.116569213867188e+02, 3.11658203125e+02, 3.116588745117188e+02, 3.116592407226562e+02, 3.11659423828125e+02, 3.116595458984375e+02, 3.116595764160156e+02, 3.116596069335938e+02, 3.116596374511719e+02, 3.116596374511719e+02, 3.116596374511719e+02, 3.117089233398438e+02, 3.119543762207031e+02, 3.123127136230469e+02, 3.126082763671875e+02, 3.128077392578125e+02, 3.12930419921875e+02, 3.13002197265625e+02, 3.1304296875e+02, 3.13065673828125e+02, 3.130781860351562e+02, 3.130850219726562e+02, 3.130887145996094e+02, 3.130907287597656e+02, 3.130918273925781e+02, 3.130924072265625e+02, 3.130927124023438e+02, 3.130928649902344e+02, 3.130929565429688e+02, 3.13093017578125e+02, 3.130930480957031e+02, 3.130930480957031e+02, 3.130930786132812e+02, 3.130930786132812e+02, 3.130930786132812e+02, 3.130930786132812e+02, 3.11747802734375e+02, 3.0840966796875e+02, 3.059796447753906e+02, 3.046723022460938e+02, 3.03968994140625e+02, 3.035906066894531e+02, 3.033870544433594e+02, 3.032775268554688e+02, 3.032186279296875e+02, 3.031869201660156e+02, 3.031698608398438e+02, 3.031606750488281e+02, 3.0315576171875e+02, 3.031531066894531e+02, 3.031516723632812e+02, 3.031509094238281e+02, 3.031504821777344e+02, 3.031502685546875e+02, 3.03150146484375e+02, 3.031500854492188e+02, 3.031500549316406e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
+chi.sta_a1.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.951499938964844e+02, 3.011499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
+time=[0e+00, 3.6e+03]
+chi.QCon_flow=[3.85672421875e+04, 3.88527265625e+04, 3.879665625e+04, 3.709869140625e+04, 3.520355859375e+04, 3.44361875e+04, 3.412917578125e+04, 3.4002140625e+04, 3.394872265625e+04, 3.392605859375e+04, 3.391636328125e+04, 3.39121875e+04, 3.3910375e+04, 3.3909578125e+04, 3.39092265625e+04, 3.39090703125e+04, 3.3909e+04, 3.390896875e+04, 3.3908953125e+04, 3.39089453125e+04, 3.390894140625e+04, 3.390894140625e+04, 3.390894140625e+04, 3.39089375e+04, 3.39089375e+04, 3.39089375e+04, 3.495830078125e+04, 3.730111718750001e+04, 3.8704703125e+04, 3.927176171875e+04, 3.949008984375e+04, 3.957241015625e+04, 3.960309765625e+04, 3.961442578125e+04, 3.96185546875e+04, 3.962004296875e+04, 3.96205625e+04, 3.9620734375e+04, 3.96207890625e+04, 3.962080078125e+04, 3.96208046875e+04, 3.96208046875e+04, 3.962080078125e+04, 3.962080078125e+04, 3.962080078125e+04, 3.962080078125e+04, 3.962080078125e+04, 3.962080078125e+04, 3.962080078125e+04, 3.962080078125e+04, 3.962080078125e+04, 1.8326759765625e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+chi.QEva_flow=[-2.85672421875e+04, -2.8852728515625e+04, -2.879665625e+04, -2.7098689453125e+04, -2.5203560546875e+04, -2.4436189453125e+04, -2.4129177734375e+04, -2.4002142578125e+04, -2.3948724609375e+04, -2.392605859375e+04, -2.391636328125e+04, -2.39121875e+04, -2.3910373046875e+04, -2.3909580078125e+04, -2.3909228515625e+04, -2.3909072265625e+04, -2.3909e+04, -2.390896875e+04, -2.3908953125e+04, -2.39089453125e+04, -2.390894140625e+04, -2.3908939453125e+04, -2.3908939453125e+04, -2.3908939453125e+04, -2.3908939453125e+04, -2.3908939453125e+04, -2.495830078125e+04, -2.730111914062501e+04, -2.8704705078125e+04, -2.9271759765625e+04, -2.9490087890625e+04, -2.957241015625e+04, -2.960309765625e+04, -2.9614423828125e+04, -2.9618556640625e+04, -2.9620041015625e+04, -2.9620560546875e+04, -2.9620736328125e+04, -2.96207890625e+04, -2.9620802734375e+04, -2.96208046875e+04, -2.9620802734375e+04, -2.9620802734375e+04, -2.962080078125e+04, -2.962080078125e+04, -2.962080078125e+04, -2.962080078125e+04, -2.962080078125e+04, -2.962080078125e+04, -2.962080078125e+04, -2.962080078125e+04, -1.43267607421875e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+chi.P=[1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 4e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+chi.dp2=[6.56662060546875e+03, 6.56662060546875e+03]
+chi.dp1=[6.40499560546875e+03, 6.40499560546875e+03]
+chi.COP_nominal=[2.85672402381897e+00, 2.85672402381897e+00]
+chi.COP=[2.85672402381897e+00, 2.885272741317749e+00, 2.879665613174438e+00, 2.709868907928467e+00, 2.520355939865112e+00, 2.443619012832642e+00, 2.412917613983154e+00, 2.400214195251465e+00, 2.394872426986694e+00, 2.392605781555176e+00, 2.391636371612549e+00, 2.391218662261963e+00, 2.391037225723267e+00, 2.390957832336426e+00, 2.390922784805298e+00, 2.390907049179077e+00, 2.390900135040283e+00, 2.390896797180176e+00, 2.390895366668701e+00, 2.390894412994385e+00, 2.390894174575806e+00, 2.390893936157227e+00, 2.390893936157227e+00, 2.390893936157227e+00, 2.390893936157227e+00, 2.390893936157227e+00, 2.495830059051514e+00, 2.730111837387085e+00, 2.870470523834229e+00, 2.927175998687744e+00, 2.949008703231812e+00, 2.957241058349609e+00, 2.960309743881226e+00, 2.961442470550537e+00, 2.96185564994812e+00, 2.9620041847229e+00, 2.962056159973145e+00, 2.962073564529419e+00, 2.962079048156738e+00, 2.962080240249634e+00, 2.962080478668213e+00, 2.962080478668213e+00, 2.962080240249634e+00, 2.962080240249634e+00, 2.962080001831055e+00, 2.962080001831055e+00, 2.962080001831055e+00, 2.962080001831055e+00, 2.962080001831055e+00, 2.962080001831055e+00, 2.962080001831055e+00, 3.581690073013306e+00, 5.654810905456543e+00, 8.321532249450684e+00, 1.108774662017824e+01, 1.347115135192872e+01, 1.52178134918213e+01, 1.6351806640625e+01, 1.703119659423828e+01, 1.741887474060059e+01, 1.763394165039062e+01, 1.775139045715332e+01, 1.781498146057129e+01, 1.784923553466797e+01, 1.786761665344238e+01, 1.787749671936035e+01, 1.788281631469727e+01, 1.788567543029785e+01, 1.788721084594727e+01, 1.788803863525391e+01, 1.788848114013672e+01, 1.788870620727539e+01, 1.788883781433105e+01, 1.78889102935791e+01, 1.788895225524902e+01, 1.788897705078125e+01, 1.788899040222168e+01, 1.788899803161621e+01, 1.788900375366211e+01, 1.788900375366211e+01, 1.788900375366211e+01, 1.788900375366211e+01, 1.788900184631348e+01, 1.788900184631348e+01, 1.788900184631348e+01, 1.788900184631348e+01, 1.788899993896484e+01, 1.788899993896484e+01, 1.788899993896484e+01, 1.788899993896484e+01, 1.788899993896484e+01, 1.788899993896484e+01, 1.788899993896484e+01, 1.788899993896484e+01, 1.788899993896484e+01, 1.788899993896484e+01, 1.788899993896484e+01, 1.788899993896484e+01, 1.788899993896484e+01, 1.788899993896484e+01, 1.788899993896484e+01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_CarnotVerifyCOP.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_CarnotVerifyCOP.txt
deleted file mode 100644
index 7993a3b3..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_CarnotVerifyCOP.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-last-generated=2017-06-16
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-chi_TEva.COP_nominal=[3e+00, 3e+00]
-chi_TEva.COP=[3e+00, 3e+00]
-time=[0e+00, 3.6e+03]
-chi_y.COP_nominal=[3e+00, 3e+00]
-chi_y.COP=[3e+00, 3e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_CarnotVerifyEtaCarnot.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_CarnotVerifyEtaCarnot.txt
deleted file mode 100644
index 0a6fecd4..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_CarnotVerifyEtaCarnot.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-last-generated=2017-06-16
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-chi_TEva.COP_nominal=[2.999998331069946e+00, 2.999998331069946e+00]
-chi_TEva.COP=[2.999998331069946e+00, 2.999998331069946e+00]
-time=[0e+00, 3.6e+03]
-chi_y.COP_nominal=[2.999998331069946e+00, 2.999998331069946e+00]
-chi_y.COP=[2.999998331069946e+00, 2.999998331069946e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_Carnot_TEva_2ndLaw.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_Carnot_TEva_2ndLaw.txt
new file mode 100644
index 00000000..9624fc75
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_Carnot_TEva_2ndLaw.txt
@@ -0,0 +1,13 @@
+last-generated=2017-06-16
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": " "
+}
+chi_b.SGen_flow=[9.864697265625e+01, 9.802871702718306e+01, 9.740945431799366e+01, 9.678919215807382e+01, 9.616792291803314e+01, 9.554563908448152e+01, 9.492235556818481e+01, 9.429804994537633e+01, 9.367273700965302e+01, 9.304640220166993e+01, 9.241904458817025e+01, 9.179066463535999e+01, 9.116125471383441e+01, 9.053082245300963e+01, 8.989936069440039e+01, 8.92668613391717e+01, 8.863333107203698e+01, 8.799875652223704e+01, 8.736314437581767e+01, 8.672649368350935e+01, 8.608879108372965e+01, 8.545003467602959e+01, 8.481023399348139e+01, 8.416938045555426e+01, 8.352747310501833e+01, 8.288449859619141e+01, 8.22404702714133e+01, 8.159537575360487e+01, 8.094921119768499e+01, 8.030197089493977e+01, 7.965367203799022e+01, 7.900428787465867e+01, 7.83538355938463e+01, 7.770229425092393e+01, 7.70496752213371e+01, 7.639596518615861e+01, 7.574117372786887e+01, 7.508528931442133e+01, 7.44283062660149e+01, 7.377023221198951e+01, 7.311106148934243e+01, 7.245078253951081e+01, 7.178939732522571e+01, 7.11269078228151e+01, 7.046331008332923e+01, 6.979859844994986e+01, 6.91327672796149e+01, 6.846582023291482e+01, 6.779775166287672e+01, 6.712855593649745e+01, 6.645823669433594e+01, 6.578678829942868e+01, 6.51142031225535e+01, 6.444048116381956e+01, 6.37656264490461e+01, 6.308962330394841e+01, 6.241247956219038e+01, 6.173418759419932e+01, 6.105474358540153e+01, 6.037414753579674e+01, 5.969239969780185e+01, 5.900948812967163e+01, 5.832541307665626e+01, 5.764017453864661e+01, 5.695376870094541e+01, 5.626619174891906e+01, 5.557744397671136e+01, 5.488751335924604e+01, 5.419640399807012e+01, 5.350411207842686e+01, 5.281063378552463e+01, 5.211596911947142e+01, 5.142011078741682e+01, 5.07230581236356e+01, 5.00248038279784e+01, 4.932534790039062e+01, 4.862469034063583e+01, 4.792282351955595e+01, 4.721974362245371e+01, 4.651545485090069e+01, 4.580994880911597e+01, 4.510321824722667e+01, 4.439526316499945e+01, 4.368608356253576e+01, 4.29756756251879e+01, 4.226403596910168e+01, 4.155115992549236e+01, 4.083704028825528e+01, 4.01216808719149e+01, 3.940507404707669e+01, 3.86872159991707e+01, 3.796811101811534e+01, 3.724774671699797e+01, 3.652612356338194e+01, 3.580323774251025e+01, 3.50790892542437e+01, 3.435366665469338e+01, 3.362697809372665e+01, 3.289901109401957e+01, 3.21697623536666e+01, 3.143923377990723e+01]
+time=[0e+00, 1e+00]
+chi_b.chi.sta_b2.T=[2.891499938964844e+02, 2.891499938964844e+02]
+chi_b.chi.sta_a2.T=[2.931499938964844e+02, 2.931499938964844e+02]
+chi_b.chi.sta_b1.T=[3.197598876953125e+02, 3.194974975527275e+02, 3.192351074101425e+02, 3.189727172675575e+02, 3.187102966074081e+02, 3.184479065136948e+02, 3.181855163222244e+02, 3.179231262285248e+02, 3.176607360370546e+02, 3.173983460410707e+02, 3.17135925332077e+02, 3.168735351406158e+02, 3.166111449491365e+02, 3.163487547576663e+02, 3.160863647617279e+02, 3.158239442482296e+02, 3.15561553861273e+02, 3.152991638652892e+02, 3.150367738692508e+02, 3.147743834823488e+02, 3.145119629688414e+02, 3.142495725819302e+02, 3.139871825859009e+02, 3.13724792589908e+02, 3.134624022029605e+02, 3.131999816894531e+02, 3.129375913025875e+02, 3.126752016975946e+02, 3.124128113105834e+02, 3.121504209235723e+02, 3.11888031318543e+02, 3.116256104141356e+02, 3.113632200272336e+02, 3.111008304222771e+02, 3.108384400352114e+02, 3.105760496482548e+02, 3.103136295258293e+02, 3.100512391388181e+02, 3.097888487518069e+02, 3.095264583647957e+02, 3.092640687598574e+02, 3.090016478554136e+02, 3.08739257468548e+02, 3.084768678635006e+02, 3.082144774764894e+02, 3.079520870894782e+02, 3.076896669670527e+02, 3.074272765800598e+02, 3.071648861930304e+02, 3.069024965881831e+02, 3.066401062011719e+02, 3.063777158141644e+02, 3.061152949098699e+02, 3.058529045230079e+02, 3.055905156998683e+02, 3.05328125312679e+02, 3.050657349258189e+02, 3.04803314021377e+02, 3.04540923634515e+02, 3.042785332472529e+02, 3.040161444241861e+02, 3.037537540373241e+02, 3.034913331329569e+02, 3.032289427460221e+02, 3.02966552358942e+02, 3.027041619719345e+02, 3.024417731488313e+02, 3.021793522446459e+02, 3.019169618576384e+02, 3.016545714706291e+02, 3.013921810836235e+02, 3.011297906966161e+02, 3.008674018734765e+02, 3.006049809693274e+02, 3.003425905823199e+02, 3.000802001953125e+02, 2.998178098083051e+02, 2.995554194212976e+02, 2.992929985171485e+02, 2.990306096940089e+02, 2.987682193070015e+02, 2.985058289199595e+02, 2.982434385329866e+02, 2.979810176286556e+02, 2.977186272417937e+02, 2.974562384186905e+02, 2.971938480314648e+02, 2.969314576446029e+02, 2.966690367401628e+02, 2.964066463533009e+02, 2.961442559660751e+02, 2.958818671433721e+02, 2.9561947675611e+02, 2.95357086369248e+02, 2.950946654648061e+02, 2.94832275077946e+02, 2.945698846907567e+02, 2.943074958676171e+02, 2.940451054807551e+02, 2.937826845764606e+02, 2.935202941894531e+02]
+chi_b.chi.sta_a1.T=[3.141499938964844e+02, 3.138999938908978e+02, 3.136499938853112e+02, 3.133999938797247e+02, 3.131499938741381e+02, 3.128999939151176e+02, 3.126499938629649e+02, 3.123999939039377e+02, 3.121499938517919e+02, 3.118999939859239e+02, 3.116499939337509e+02, 3.113999938815869e+02, 3.111499938294456e+02, 3.108999937773044e+02, 3.106499939113909e+02, 3.103999940455503e+02, 3.101499938070994e+02, 3.098999939412041e+02, 3.096499940753635e+02, 3.093999938368944e+02, 3.091499939710173e+02, 3.08899993732612e+02, 3.086499938666894e+02, 3.083999940008305e+02, 3.08149993762407e+02, 3.078999938964844e+02, 3.076499936581245e+02, 3.073999941648029e+02, 3.071499939262976e+02, 3.068999936879194e+02, 3.066499941946161e+02, 3.063999939561107e+02, 3.061499937177144e+02, 3.058999942244293e+02, 3.056499939859239e+02, 3.053999937475094e+02, 3.051499942542425e+02, 3.048999940157371e+02, 3.046499937773044e+02, 3.043999935389446e+02, 3.041499940455503e+02, 3.038999938070994e+02, 3.036499935687395e+02, 3.033999940753635e+02, 3.031499938368944e+02, 3.028999935985345e+02, 3.026499941051766e+02, 3.023999938666894e+02, 3.021499936283295e+02, 3.018999941349898e+02, 3.016499938964844e+02, 3.01399993658128e+02, 3.011499934197717e+02, 3.008999931814154e+02, 3.006499944331135e+02, 3.003999941946117e+02, 3.001499939561116e+02, 2.998999937177171e+02, 2.996499934793608e+02, 2.993999932410044e+02, 2.99149994492739e+02, 2.988999942542371e+02, 2.986499940157353e+02, 2.983999937773062e+02, 2.981499935389498e+02, 2.978999933005935e+02, 2.976499945523645e+02, 2.973999943138626e+02, 2.971499940753608e+02, 2.968999938368935e+02, 2.96649993598539e+02, 2.963999933601826e+02, 2.961499946119899e+02, 2.958999943734881e+02, 2.956499941349862e+02, 2.953999938964844e+02, 2.95149993658128e+02, 2.948999934197717e+02, 2.946499931814154e+02, 2.943999944331135e+02, 2.941499941946117e+02, 2.938999939561116e+02, 2.936499937177171e+02, 2.933999934793608e+02, 2.931499932410044e+02, 2.92899994492739e+02, 2.926499942542371e+02, 2.923999940157353e+02, 2.921499937773062e+02, 2.918999935389498e+02, 2.916499933005935e+02, 2.913999945523645e+02, 2.911499943138626e+02, 2.908999940753608e+02, 2.906499938368935e+02, 2.90399993598539e+02, 2.901499933601826e+02, 2.898999946119899e+02, 2.896499943734881e+02, 2.893999941349862e+02, 2.891499938964844e+02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_Carnot_TEva_HighTemperature.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_Carnot_TEva_HighTemperature.txt
new file mode 100644
index 00000000..ec2fe780
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_Carnot_TEva_HighTemperature.txt
@@ -0,0 +1,25 @@
+last-generated=2017-06-16
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": " "
+}
+chi.sta_a2.T=[2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 3.103500061035156e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02]
+chi.sta_b2.T=[2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 3.103500061035156e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02]
+chi.TSet=[2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.995499877929688e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02]
+time=[0e+00, 3.6e+03]
+chi.QCon_flow=[2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 2.278595625e+05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.03534296875e+05, 2.03534296875e+05, 2.03534296875e+05, 2.03534296875e+05, 2.03534296875e+05, 2.03534296875e+05, 2.03534296875e+05, 2.03534296875e+05, 2.03534296875e+05, 2.03534296875e+05, 2.03534296875e+05, 2.03534296875e+05, 2.03534296875e+05, 2.03534296875e+05, 2.03534296875e+05, 2.03534296875e+05]
+chi.QEva_flow=[-1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, -1.5939046875e+05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.9923809375e+05, -1.9923809375e+05, -1.9923809375e+05, -1.9923809375e+05, -1.9923809375e+05, -1.9923809375e+05, -1.9923809375e+05, -1.9923809375e+05, -1.9923809375e+05, -1.9923809375e+05, -1.9923809375e+05, -1.9923809375e+05, -1.9923809375e+05, -1.9923809375e+05, -1.9923809375e+05, -1.9923809375e+05]
+chi.P=[6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 6.84690859375e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.29619482421875e+03, 4.29619482421875e+03, 4.29619482421875e+03, 4.29619482421875e+03, 4.29619482421875e+03, 4.29619482421875e+03, 4.29619482421875e+03, 4.29619482421875e+03, 4.29619482421875e+03, 4.29619482421875e+03, 4.29619482421875e+03, 4.29619482421875e+03, 4.29619482421875e+03, 4.29619482421875e+03, 4.29619482421875e+03, 4.29619482421875e+03]
+chi.dp2=[6e+03, 6e+03]
+chi.dp1=[1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 1.709169921875e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.3637220703125e+04, 1.3637220703125e+04, 1.3637220703125e+04, 1.3637220703125e+04, 1.3637220703125e+04, 1.3637220703125e+04, 1.3637220703125e+04, 1.3637220703125e+04, 1.3637220703125e+04, 1.3637220703125e+04, 1.3637220703125e+04, 1.3637220703125e+04, 1.3637220703125e+04, 1.3637220703125e+04, 1.3637220703125e+04, 1.3637220703125e+04]
+chi.COP_nominal=[2.85672402381897e+00, 2.85672402381897e+00]
+chi.COP=[2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.327918767929077e+00, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 2.951499938964844e+01, 9.310500335693359e+01, 4.63754768371582e+01, 4.63754768371582e+01, 4.63754768371582e+01, 4.63754768371582e+01, 4.63754768371582e+01, 4.63754768371582e+01, 4.63754768371582e+01, 4.63754768371582e+01, 4.63754768371582e+01, 4.63754768371582e+01, 4.63754768371582e+01, 4.63754768371582e+01, 4.63754768371582e+01, 4.63754768371582e+01, 4.63754768371582e+01, 4.63754768371582e+01]
+chi.port_b1.m_flow=[-5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, -5.445974349975586e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -4.864586353302002e+00, -4.864586353302002e+00, -4.864586353302002e+00, -4.864586353302002e+00, -4.864586353302002e+00, -4.864586353302002e+00, -4.864586353302002e+00, -4.864586353302002e+00, -4.864586353302002e+00, -4.864586353302002e+00, -4.864586353302002e+00, -4.864586353302002e+00, -4.864586353302002e+00, -4.864586353302002e+00, -4.864586353302002e+00, -4.864586353302002e+00]
+chi.port_a1.m_flow=[5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 5.445974349975586e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.864586353302002e+00, 4.864586353302002e+00, 4.864586353302002e+00, 4.864586353302002e+00, 4.864586353302002e+00, 4.864586353302002e+00, 4.864586353302002e+00, 4.864586353302002e+00, 4.864586353302002e+00, 4.864586353302002e+00, 4.864586353302002e+00, 4.864586353302002e+00, 4.864586353302002e+00, 4.864586353302002e+00, 4.864586353302002e+00, 4.864586353302002e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_Carnot_TEva_LimitedCapacity.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_Carnot_TEva_LimitedCapacity.txt
new file mode 100644
index 00000000..acb8c647
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_Carnot_TEva_LimitedCapacity.txt
@@ -0,0 +1,25 @@
+last-generated=2017-06-16
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": " "
+}
+chi.sta_a2.T=[2.951499938964844e+02, 2.951499938964844e+02]
+chi.sta_b2.T=[2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
+chi.TSet=[2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.851499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
+time=[0e+00, 3.6e+03]
+chi.sta_b1.T=[3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02]
+chi.sta_a1.T=[2.981499938964844e+02, 2.981499938964844e+02]
+chi.QCon_flow=[1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.3120746875e+05, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04, 7.450853125e+04]
+chi.QEva_flow=[-9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.9619046875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04]
+chi.P=[3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1778302734375e+04, 3.1588421875e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04, 1.47371005859375e+04]
+chi.dp2=[6e+03, 6e+03]
+chi.dp1=[5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.66719091796875e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03, 1.827522338867188e+03]
+chi.COP_nominal=[2.85672402381897e+00, 2.85672402381897e+00]
+chi.COP=[3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.153656959533691e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00, 4.05584716796875e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_Carnot_TEva_etaPL.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_Carnot_TEva_etaPL.txt
new file mode 100644
index 00000000..c41aa4c4
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_Carnot_TEva_etaPL.txt
@@ -0,0 +1,26 @@
+last-generated=2017-06-16
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": " "
+}
+chi.sta_a2.T=[2.951499938964844e+02, 2.951499938964844e+02]
+chi.sta_b2.T=[2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851117553710938e+02, 2.851499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
+chi.TSet=[2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.791499938964844e+02, 2.851499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
+time=[0e+00, 3.6e+03]
+chi.sta_b1.T=[3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02]
+chi.sta_a1.T=[2.981499938964844e+02, 2.981499938964844e+02]
+chi.QCon_flow=[1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.31778296875e+05, 1.3124425e+05, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04, 7.6555046875e+04]
+chi.QEva_flow=[-9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.99999921875e+04, -9.9619046875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04, -5.97714296875e+04]
+chi.P=[3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.17783046875e+04, 3.1625205078125e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04, 1.678362109375e+04]
+chi.dp2=[6e+03, 6e+03]
+chi.dp1=[5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.71660888671875e+03, 5.67036865234375e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03, 1.929293823242188e+03]
+chi.COP_nominal=[2.85672402381897e+00, 2.85672402381897e+00]
+chi.COP=[3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.146800756454468e+00, 3.149989128112793e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00, 3.5612952709198e+00]
+chi.etaPL=[9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.999999403953552e-01, 9.988571405410767e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01, 8.793143033981323e-01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_Carnot_TEva_reverseFlow.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_Carnot_TEva_reverseFlow.txt
new file mode 100644
index 00000000..2dd0e9cf
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_Carnot_TEva_reverseFlow.txt
@@ -0,0 +1,25 @@
+last-generated=2017-06-16
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": " "
+}
+chi.sta_a2.T=[2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+chi.sta_b2.T=[2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+chi.TSet=[2.831499938964844e+02, 2.831499938964844e+02]
+time=[0e+00, 3.6e+03]
+chi.sta_b1.T=[3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
+chi.sta_a1.T=[2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+chi.QCon_flow=[1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 1.618205625e+05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+chi.QEva_flow=[-1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, -1.19542859375e+05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
+chi.P=[4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 4.2277703125e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+chi.dp2=[6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, -2.4e+02, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03]
+chi.dp1=[8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 8.9054609375e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+chi.COP_nominal=[2.85672402381897e+00, 2.85672402381897e+00]
+chi.COP=[2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 2.827562808990479e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00, 5.663000106811523e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_Carnot_y_etaPL.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_Carnot_y_etaPL.txt
new file mode 100644
index 00000000..5eaf4b42
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Chillers_Validation_Carnot_y_etaPL.txt
@@ -0,0 +1,21 @@
+last-generated=2017-06-16
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "number of continuous time states": "2",
+ "linear": " "
+}
+chi.sta_a2.T=[2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.941499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
+chi.sta_b2.T=[2.781499938964844e+02, 2.783188171386719e+02, 2.783806457519531e+02, 2.786059875488281e+02, 2.791209411621094e+02, 2.796175842285156e+02, 2.799622497558594e+02, 2.801763916015625e+02, 2.803025207519531e+02, 2.8037451171875e+02, 2.804148254394531e+02, 2.804371032714844e+02, 2.804493103027344e+02, 2.804559631347656e+02, 2.804595642089844e+02, 2.804615173339844e+02, 2.804625854492188e+02, 2.80463134765625e+02, 2.804634399414062e+02, 2.804635925292969e+02, 2.804636840820312e+02, 2.804637451171875e+02, 2.804637756347656e+02, 2.804637756347656e+02, 2.804637756347656e+02, 2.804638061523438e+02, 2.819234313964844e+02, 2.849303283691406e+02, 2.866742248535156e+02, 2.874490051269531e+02, 2.878085327148438e+02, 2.879824829101562e+02, 2.880695495605469e+02, 2.881141357421875e+02, 2.881373596191406e+02, 2.881495971679688e+02, 2.881560974121094e+02, 2.881595458984375e+02, 2.881614074707031e+02, 2.881623840332031e+02, 2.881629028320312e+02, 2.881632080078125e+02, 2.881633605957031e+02, 2.881634216308594e+02, 2.881634826660156e+02, 2.881635131835938e+02, 2.881635131835938e+02, 2.881635131835938e+02, 2.881635131835938e+02, 2.881635131835938e+02, 2.881635131835938e+02, 2.897376098632812e+02, 2.931108703613281e+02, 2.954600219726562e+02, 2.967140502929688e+02, 2.973834533691406e+02, 2.977407836914062e+02, 2.979315490722656e+02, 2.980333862304688e+02, 2.980877380371094e+02, 2.981167602539062e+02, 2.981322631835938e+02, 2.981405334472656e+02, 2.981449279785156e+02, 2.981472778320312e+02, 2.981485595703125e+02, 2.981492309570312e+02, 2.981495971679688e+02, 2.981497802734375e+02, 2.981498718261719e+02, 2.981499328613281e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
+chi.sta_b1.T=[3.031499938964844e+02, 3.030289001464844e+02, 3.031779174804688e+02, 3.0537451171875e+02, 3.083114929199219e+02, 3.098458251953125e+02, 3.106121215820312e+02, 3.110019226074219e+02, 3.11202880859375e+02, 3.113074951171875e+02, 3.113623962402344e+02, 3.11391357421875e+02, 3.114067077636719e+02, 3.114148559570312e+02, 3.114192199707031e+02, 3.114215393066406e+02, 3.114227905273438e+02, 3.114234313964844e+02, 3.114237976074219e+02, 3.114239807128906e+02, 3.114241027832031e+02, 3.114241333007812e+02, 3.114241638183594e+02, 3.114241943359375e+02, 3.114241943359375e+02, 3.114241943359375e+02, 3.114867248535156e+02, 3.117982177734375e+02, 3.122464904785156e+02, 3.12603759765625e+02, 3.128362121582031e+02, 3.12974609375e+02, 3.130534057617188e+02, 3.1309716796875e+02, 3.131211547851562e+02, 3.131341552734375e+02, 3.131412048339844e+02, 3.1314501953125e+02, 3.131470336914062e+02, 3.131481323242188e+02, 3.131487426757812e+02, 3.131490478515625e+02, 3.131492004394531e+02, 3.131492919921875e+02, 3.131493530273438e+02, 3.131493835449219e+02, 3.131493835449219e+02, 3.131494140625e+02, 3.131494140625e+02, 3.131494140625e+02, 3.131494140625e+02, 3.115971374511719e+02, 3.082317504882812e+02, 3.058839111328125e+02, 3.046207885742188e+02, 3.039412841796875e+02, 3.035757141113281e+02, 3.033790283203125e+02, 3.032732238769531e+02, 3.032162780761719e+02, 3.031856689453125e+02, 3.03169189453125e+02, 3.031603088378906e+02, 3.031555480957031e+02, 3.031529846191406e+02, 3.03151611328125e+02, 3.0315087890625e+02, 3.031504821777344e+02, 3.031502380371094e+02, 3.03150146484375e+02, 3.031500854492188e+02, 3.031500549316406e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
+chi.sta_a1.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.951499938964844e+02, 3.011499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
+time=[0e+00, 3.6e+03]
+chi.QCon_flow=[3.85672421875e+04, 3.893742578125e+04, 3.883946875e+04, 3.66401328125e+04, 3.433949609375e+04, 3.348888671875e+04, 3.317335546875e+04, 3.3051359375e+04, 3.300324609375e+04, 3.298403515625e+04, 3.297626171875e+04, 3.297308203125e+04, 3.29717578125e+04, 3.297119921875e+04, 3.297095703125e+04, 3.29708515625e+04, 3.297080078125e+04, 3.297078125e+04, 3.297076953125e+04, 3.2970765625e+04, 3.297076171875e+04, 3.297076171875e+04, 3.29707578125e+04, 3.29707578125e+04, 3.29707578125e+04, 3.29707578125e+04, 3.43015546875e+04, 3.727158984375001e+04, 3.89462265625e+04, 3.95464375e+04, 3.9748421875e+04, 3.98146015625e+04, 3.983589453125e+04, 3.984258203125e+04, 3.984460546875e+04, 3.98451796875e+04, 3.984531640625e+04, 3.984533203125e+04, 3.98453203125e+04, 3.984530859375e+04, 3.984530078125e+04, 3.9845296875e+04, 3.984529296875e+04, 3.984529296875e+04, 3.98452890625e+04, 3.98452890625e+04, 3.98452890625e+04, 3.98452890625e+04, 3.98452890625e+04, 3.98452890625e+04, 3.98452890625e+04, 1.6186955078125e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+chi.QEva_flow=[-2.85672421875e+04, -2.893742578125e+04, -2.883946875e+04, -2.6640134765625e+04, -2.4339494140625e+04, -2.348888671875e+04, -2.317335546875e+04, -2.3051359375e+04, -2.3003244140625e+04, -2.2984033203125e+04, -2.2976263671875e+04, -2.2973080078125e+04, -2.29717578125e+04, -2.2971197265625e+04, -2.297095703125e+04, -2.2970849609375e+04, -2.2970802734375e+04, -2.297078125e+04, -2.297076953125e+04, -2.2970763671875e+04, -2.297076171875e+04, -2.2970759765625e+04, -2.2970759765625e+04, -2.2970759765625e+04, -2.2970759765625e+04, -2.2970759765625e+04, -2.4301556640625e+04, -2.727159179687501e+04, -2.8946224609375e+04, -2.95464375e+04, -2.9748423828125e+04, -2.9814603515625e+04, -2.9835892578125e+04, -2.984258203125e+04, -2.9844603515625e+04, -2.9845177734375e+04, -2.9845314453125e+04, -2.984533203125e+04, -2.9845322265625e+04, -2.9845310546875e+04, -2.984530078125e+04, -2.9845296875e+04, -2.984529296875e+04, -2.9845291015625e+04, -2.9845291015625e+04, -2.9845291015625e+04, -2.9845291015625e+04, -2.9845291015625e+04, -2.9845291015625e+04, -2.98452890625e+04, -2.98452890625e+04, -1.2186955078125e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+chi.P=[1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 4e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+chi.dp2=[6.56662060546875e+03, 6.56662060546875e+03]
+chi.dp1=[6.40499560546875e+03, 6.40499560546875e+03]
+chi.COP_nominal=[2.85672402381897e+00, 2.85672402381897e+00]
+chi.COP=[2.85672402381897e+00, 2.893742561340332e+00, 2.883946895599365e+00, 2.664013385772705e+00, 2.43394947052002e+00, 2.348888635635376e+00, 2.317335605621338e+00, 2.30513596534729e+00, 2.300324440002441e+00, 2.29840350151062e+00, 2.297626256942749e+00, 2.297307968139648e+00, 2.297175645828247e+00, 2.297119855880737e+00, 2.297095775604248e+00, 2.297085046768188e+00, 2.297080278396606e+00, 2.297078132629395e+00, 2.297076940536499e+00, 2.297076463699341e+00, 2.297076225280762e+00, 2.297075986862183e+00, 2.297075986862183e+00, 2.297075986862183e+00, 2.297075986862183e+00, 2.297075986862183e+00, 2.430155515670776e+00, 2.727159261703492e+00, 2.894622564315796e+00, 2.954643726348877e+00, 2.974842309951782e+00, 2.981460332870483e+00, 2.98358941078186e+00, 2.98425817489624e+00, 2.984460353851318e+00, 2.984517812728882e+00, 2.984531402587891e+00, 2.984533071517944e+00, 2.984532117843628e+00, 2.984530925750732e+00, 2.984529972076416e+00, 2.984529495239258e+00, 2.984529256820679e+00, 2.984529256820679e+00, 2.9845290184021e+00, 2.9845290184021e+00, 2.9845290184021e+00, 2.9845290184021e+00, 2.9845290184021e+00, 2.9845290184021e+00, 2.9845290184021e+00, 3.046738862991333e+00, 4.070741176605225e+00, 5.952347755432129e+00, 7.880606651306164e+00, 9.523061752319345e+00, 1.071576118469239e+01, 1.14852466583252e+01, 1.194447135925293e+01, 1.220589065551758e+01, 1.235072135925293e+01, 1.242975521087646e+01, 1.247252178192139e+01, 1.249553680419922e+01, 1.250791645050049e+01, 1.251457595825195e+01, 1.251815032958984e+01, 1.25200719833374e+01, 1.252110385894775e+01, 1.252164745330811e+01, 1.25219259262085e+01, 1.252208423614502e+01, 1.252218151092529e+01, 1.252224254608154e+01, 1.252227401733398e+01, 1.252228736877441e+01, 1.2522292137146e+01, 1.252229404449463e+01, 1.2522292137146e+01, 1.252229309082031e+01, 1.252229404449463e+01, 1.252229595184326e+01, 1.252229690551758e+01, 1.252229785919189e+01, 1.252229785919189e+01, 1.252229881286621e+01, 1.252229881286621e+01, 1.252229881286621e+01, 1.252229881286621e+01, 1.252229976654053e+01, 1.252229976654053e+01, 1.252229976654053e+01, 1.252229976654053e+01, 1.252229976654053e+01, 1.252229976654053e+01, 1.252229976654053e+01, 1.252229976654053e+01, 1.252229976654053e+01, 1.252229976654053e+01, 1.252229976654053e+01, 1.252229976654053e+01]
+chi.etaPL=[1e+00, 1.003887534141541e+00, 1.002858757972717e+00, 9.797624349594116e-01, 9.556021690368652e-01, 9.466694593429565e-01, 9.43355917930603e-01, 9.420747756958008e-01, 9.41569447517395e-01, 9.413677453994751e-01, 9.412861466407776e-01, 9.412527084350586e-01, 9.412388205528259e-01, 9.412329196929932e-01, 9.412304162979126e-01, 9.412292838096619e-01, 9.412288069725037e-01, 9.412285685539246e-01, 9.41228449344635e-01, 9.412283897399902e-01, 9.412283301353455e-01, 9.412283301353455e-01, 9.412283301353455e-01, 9.412283301353455e-01, 9.412283301353455e-01, 9.412283301353455e-01, 9.552037119865417e-01, 9.86393690109253e-01, 1.003979921340942e+00, 1.01028311252594e+00, 1.012404203414917e+00, 1.013099193572998e+00, 1.013322830200195e+00, 1.013393044471741e+00, 1.013414263725281e+00, 1.013420343399048e+00, 1.013421773910522e+00, 1.013421893119812e+00, 1.013421773910522e+00, 1.013421654701233e+00, 1.013421535491943e+00, 1.013421535491943e+00, 1.013421535491943e+00, 1.013421535491943e+00, 1.013421535491943e+00, 1.013421535491943e+00, 1.013421535491943e+00, 1.013421535491943e+00, 1.013421535491943e+00, 1.013421416282654e+00, 1.013421416282654e+00, 8.279817700386047e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Delays_Examples_Delay.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Delays_Examples_Delay.txt
deleted file mode 100644
index e5dbdac5..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Delays_Examples_Delay.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'number of continuous time states': '3', 'linear': ' '}
-del.T=[283.149993896484375, 283.535552978515625, 284.00445556640625, 284.4505615234375, 284.8748779296875, 285.2784423828125, 285.66229248046875, 286.0274658203125, 286.37481689453125, 286.705230712890625, 287.01953125, 287.318511962890625, 287.6029052734375, 287.873443603515625, 288.130767822265625, 288.37554931640625, 288.6083984375, 288.82989501953125, 289.04058837890625, 289.240997314453125, 289.431640625, 289.61297607421875, 289.78546142578125, 289.949554443359375, 290.105621337890625, 290.25408935546875, 290.39532470703125, 290.5296630859375, 290.657440185546875, 290.77899169921875, 290.894622802734375, 291.004608154296875, 291.109222412109375, 291.208770751953125, 291.303436279296875, 291.39349365234375, 291.479156494140625, 291.560638427734375, 291.63812255859375, 291.71185302734375, 291.782012939453125, 291.848724365234375, 291.91217041015625, 291.9725341796875, 292.02996826171875, 292.0845947265625, 292.13653564453125, 292.18597412109375, 292.23297119140625, 292.2777099609375, 292.32025146484375, 292.3607177734375, 292.399200439453125, 292.435821533203125, 292.47064208984375, 292.5037841796875, 292.5352783203125, 292.565277099609375, 292.593780517578125, 292.62091064453125, 292.646697998046875, 292.6712646484375, 292.694610595703125, 292.716796875, 292.737945556640625, 292.758026123046875, 292.77716064453125, 292.795318603515625, 292.8126220703125, 292.829071044921875, 292.8447265625, 292.859619140625, 292.873779296875, 292.887237548828125, 292.900054931640625, 292.912261962890625, 292.923858642578125, 292.93487548828125, 292.94537353515625, 292.955352783203125, 292.96484375, 292.973876953125, 292.982452392578125, 292.990631103515625, 292.9984130859375, 293.00579833984375, 293.0128173828125, 293.019500732421875, 293.02587890625, 293.03192138671875, 293.03765869140625, 293.04315185546875, 293.04833984375, 293.053314208984375, 293.058013916015625, 293.0625, 293.0667724609375, 293.070831298828125, 293.074676513671875, 293.078338623046875, 293.08184814453125]
-time=[0., 300.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Basic.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Basic.txt
new file mode 100644
index 00000000..12a6128d
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Basic.txt
@@ -0,0 +1,16 @@
+last-generated=2017-05-01
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 31, 1, 1, 1, 1, 1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "0, 0, 29, 0, 1, 0, 1, 1, 1",
+ "number of continuous time states": "74",
+ "linear": "24"
+}
+pmpSouth.m_flow=[7.08352446945817e-19, 3.54542064666748e+00, 5.229339122772217e+00, 5.277144432067871e+00, 5.182986736297607e+00, 5.114256858825684e+00, 5.076239109039307e+00, 5.063357353210449e+00, 5.0704026222229e+00, 5.091779232025146e+00, 5.122071266174316e+00, 5.155332565307617e+00, 5.186187744140625e+00, 5.221305370330811e+00, 5.256616592407227e+00, 5.289435386657715e+00, 5.318986892700195e+00, 5.345248699188232e+00, 5.368416786193848e+00, 5.388723373413086e+00, 5.406383037567139e+00, 5.421582698822021e+00, 5.434479236602783e+00, 5.44520378112793e+00, 5.45386266708374e+00, 5.460541248321533e+00, 5.465303897857666e+00, 5.77844762802124e+00, 6.106607437133789e+00, 6.244128227233887e+00, 6.263260841369629e+00, 6.233724117279053e+00, 6.194435596466064e+00, 6.158918380737305e+00, 6.128512859344482e+00, 6.101109504699707e+00, 6.074445247650146e+00, 6.043452262878418e+00, 6.012558460235596e+00, 5.980763912200928e+00, 5.945429801940918e+00, 5.905558586120605e+00, 5.860684871673584e+00, 5.810428619384766e+00, 5.754377365112305e+00, 5.692053318023682e+00, 5.622911930084229e+00, 5.546345233917236e+00, 5.461686134338379e+00, 5.368211269378662e+00, 5.265146255493164e+00, 4.081645011901855e+00, 1.589412450790405e+00, 4.602667093276978e-01, 8.180996775627136e-02, 1.686382666230202e-02, 1.116543728858232e-02, 1.070661842823029e-02, 1.044497173279524e-02, 1.006232667714357e-02, 9.575006552040577e-03, 8.996468968689442e-03, 8.330135606229305e-03, 7.578277494758368e-03, 6.747630890458822e-03, 5.853069480508566e-03, 4.919788334518671e-03, 3.983353730291128e-03, 3.086644457653165e-03, 2.273458754643798e-03, 1.580133801326156e-03, 1.028103521093726e-03, 6.204033852554858e-04, 3.433371020946652e-04, 1.720487198326737e-04, 7.740080764051527e-05, 3.191517680534162e-05, 1.324163895333186e-05, 6.48531386104878e-06, 5.059335762780393e-06, 5.10724248670158e-06, 4.71812427349505e-06, 3.671390913950745e-06, 2.476946065144148e-06, 1.491779698881146e-06, 8.173710739356466e-07, 4.128784496515436e-07, 1.945177956486077e-07, 8.653175598283269e-08, 3.690487204721649e-08, 1.540086458362566e-08, 6.46783959723507e-09, 2.836137324990773e-09, 1.357273848867635e-09, 7.415503766594611e-10, 4.737868986026683e-10, 3.52029488892569e-10, 2.9409316648632e-10, 2.658978315306371e-10, 2.525870623770743e-10, 2.483891980986641e-10]
+pmpNorth.m_flow=[8.03282330680605e-19, 3.940251588821411e+00, 5.780928134918213e+00, 5.808576107025146e+00, 5.689266204833984e+00, 5.604330062866211e+00, 5.557217597961426e+00, 5.54055643081665e+00, 5.54783821105957e+00, 5.57225227355957e+00, 5.607275009155273e+00, 5.646489143371582e+00, 5.681771278381348e+00, 5.721962928771973e+00, 5.762668132781982e+00, 5.800478935241699e+00, 5.83441162109375e+00, 5.86444091796875e+00, 5.890820026397705e+00, 5.913846969604492e+00, 5.933798789978027e+00, 5.950913429260254e+00, 5.965392589569092e+00, 5.977402687072754e+00, 5.98707914352417e+00, 5.994529724121094e+00, 5.999836444854736e+00, 6.391314029693604e+00, 6.808346748352051e+00, 6.98150634765625e+00, 7.00043773651123e+00, 6.957550048828125e+00, 6.904164791107178e+00, 6.857476234436035e+00, 6.818715572357178e+00, 6.784785747528076e+00, 6.752520561218262e+00, 6.716271877288818e+00, 6.678719520568848e+00, 6.640993118286133e+00, 6.59932279586792e+00, 6.552196502685547e+00, 6.49893856048584e+00, 6.439033985137939e+00, 6.371935844421387e+00, 6.297019004821777e+00, 6.213576316833496e+00, 6.120828628540039e+00, 6.017935276031494e+00, 5.904006958007812e+00, 5.778125286102295e+00, 4.468039989471436e+00, 1.739686012268066e+00, 4.988225400447845e-01, 9.165732562541962e-02, 1.89551804214716e-02, 1.253931224346161e-02, 1.200523879379034e-02, 1.168686244636774e-02, 1.122762355953455e-02, 1.06465108692646e-02, 9.959547780454159e-03, 9.172203950583935e-03, 8.289720863103867e-03, 7.323580328375101e-03, 6.295362487435341e-03, 5.238285753875971e-03, 4.195704124867916e-03, 3.215975360944867e-03, 2.344417618587613e-03, 1.614704029634595e-03, 1.042826566845179e-03, 6.257863715291023e-04, 3.449899377301335e-04, 1.724643807392567e-04, 7.748499774606898e-05, 3.192949588992633e-05, 1.324420463788556e-05, 6.486136953753885e-06, 5.060222520114621e-06, 5.109250651003094e-06, 4.722649919131072e-06, 3.67932148037653e-06, 2.48779679168365e-06, 1.503728299212526e-06, 8.283157058031065e-07, 4.214231807964097e-07, 2.003228587454942e-07, 9.003306900012831e-08, 3.882212240569061e-08, 1.638043300999925e-08, 6.951457187653887e-09, 3.077123222894329e-09, 1.484749101443583e-09, 8.168508092154525e-10, 5.249063406154164e-10, 3.918455560025791e-10, 3.286019789605632e-10, 2.980086732939924e-10, 2.837917123521549e-10, 2.796326503684554e-10]
+time=[0e+00, 1e+03]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Simplified1.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Simplified1.txt
new file mode 100644
index 00000000..468fdf9b
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Simplified1.txt
@@ -0,0 +1,16 @@
+last-generated=2017-05-02
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 30, 1, 1, 1, 1, 1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "0, 0, 29, 0, 1, 0, 1, 1, 1",
+ "number of continuous time states": "74",
+ "linear": "24"
+}
+pmpSouth.m_flow=[-3.0270529113536e-22, 5.512304696947843e-05, 1.096055841319688e-04, 1.635689631719512e-04, 2.171222263307858e-04, 2.703771751839668e-04, 3.234436900145985e-04, 3.764319471387574e-04, 4.294516921121972e-04, 4.82617104329281e-04, 5.360491340979934e-04, 5.898770631021943e-04, 6.442404440959086e-04, 6.99293360520748e-04, 7.552078012077597e-04, 8.121778955683112e-04, 8.704278594273979e-04, 9.302144465402397e-04, 9.918408768210425e-04, 1.055665562602685e-03, 1.122114830650389e-03, 1.191698199549628e-03, 1.2650193754686e-03, 1.342778598282005e-03, 1.42573894721546e-03, 1.514610601589084e-03, 1.609752398120979e-03, 1.710580380091373e-03, 1.814864858890923e-03, 1.92069973895094e-03, 2.027872484177351e-03, 2.136266661524432e-03, 2.245770249255047e-03, 2.35627550339595e-03, 2.467677356285624e-03, 2.579874591901898e-03, 2.692768923927438e-03, 2.806265085728403e-03, 2.92027188326099e-03, 3.034700763107197e-03, 3.149466356262565e-03, 3.264486433845464e-03, 3.37968090182471e-03, 3.494972608833592e-03, 3.610288614336661e-03, 3.725557122379541e-03, 3.840709447688101e-03, 3.955679699038081e-03, 4.07040330141474e-03, 4.184820580274703e-03, 4.298871848732233e-03, 4.412500761516216e-03, 4.525652836173883e-03, 4.638276314178365e-03, 4.750321978250214e-03, 4.861740861088037e-03, 4.972487793278291e-03, 5.082519002653306e-03, 5.191790663501529e-03, 5.300264702419967e-03, 5.40790194645524e-03, 5.514666073747162e-03, 5.620523091079491e-03, 5.725438507198343e-03, 5.829382589054872e-03, 5.932324100285769e-03, 6.034235566584205e-03, 6.135089048390623e-03, 6.234858926913486e-03, 6.333521473622115e-03, 6.431054789572954e-03, 6.527437454071448e-03, 6.622649443837674e-03, 6.716671221354716e-03, 6.8094859881839e-03, 6.90107699483633e-03, 6.991428874203091e-03, 7.080527190977453e-03, 7.168358025296426e-03, 7.254911504587824e-03, 7.340175565332174e-03, 7.424139565071112e-03, 7.506796314997267e-03, 7.588135390079716e-03, 7.668151356718245e-03, 7.746835704892874e-03, 7.824183148695197e-03, 7.900190683086719e-03, 7.974851735129147e-03, 8.048165866143429e-03, 8.120128884911537e-03, 8.190738701268862e-03, 8.259995039717648e-03, 8.327896578287862e-03, 8.39444461207387e-03, 8.459637872874737e-03, 8.523477931247057e-03, 8.585968172467567e-03, 8.64710926626964e-03, 8.70690610410403e-03, 8.765360340476036e-03]
+pmpNorth.m_flow=[4.495264295349688e-13, 6.262936129045769e-05, 1.245298462711268e-04, 1.85838354801984e-04, 2.466795813443363e-04, 3.071797254960984e-04, 3.674642213917445e-04, 4.276584730996535e-04, 4.878870896390879e-04, 5.482795676223491e-04, 6.089730886742473e-04, 6.701154488065741e-04, 7.318645652753069e-04, 7.943954852404504e-04, 8.579039284332825e-04, 9.226101683452725e-04, 9.887692126421947e-04, 1.05667204115206e-03, 1.126664026235953e-03, 1.199151290574008e-03, 1.274618785828352e-03, 1.353645192837945e-03, 1.436915557275004e-03, 1.525225860027665e-03, 1.619442855836174e-03, 1.720372471027076e-03, 1.828422760468897e-03, 1.942929988991873e-03, 2.061361736814537e-03, 2.181552933790632e-03, 2.303262241184711e-03, 2.426357592310359e-03, 2.550711562938678e-03, 2.676201811594283e-03, 2.802709229353547e-03, 2.930118702352047e-03, 3.058319102706825e-03, 3.187202088427429e-03, 3.316663965992232e-03, 3.446604001120838e-03, 3.576925955712795e-03, 3.707536155246668e-03, 3.838343562611052e-03, 3.969260707340477e-03, 4.100205251875147e-03, 4.231094848364592e-03, 4.361852196770885e-03, 4.49240232300442e-03, 4.622671970605493e-03, 4.752593456878944e-03, 4.882099106907845e-03, 5.01112419348238e-03, 5.139608180539723e-03, 5.267491320718011e-03, 5.394718023019047e-03, 5.521233193576336e-03, 5.646984678021497e-03, 5.771923116246972e-03, 5.895999489927691e-03, 6.019169347598717e-03, 6.141388788819313e-03, 6.26261683507867e-03, 6.382814370897489e-03, 6.501942646613085e-03, 6.619967873767845e-03, 6.736854556947947e-03, 6.852570565193721e-03, 6.96708563065694e-03, 7.080369879501242e-03, 7.192396452470615e-03, 7.303140126168728e-03, 7.41257715155462e-03, 7.520684245741566e-03, 7.627439482585514e-03, 7.732823856782106e-03, 7.836817763745785e-03, 7.939403973686957e-03, 8.040567119989643e-03, 8.140289966904565e-03, 8.238561358273966e-03, 8.335367776453495e-03, 8.430698525122184e-03, 8.524542851698619e-03, 8.616890583282195e-03, 8.707735099249412e-03, 8.797066286206245e-03, 8.884879427793433e-03, 8.971169753776034e-03, 9.055930029289293e-03, 9.139160008615388e-03, 9.220854379236698e-03, 9.301011147176136e-03, 9.379631056559196e-03, 9.456710744091055e-03, 9.532251679922034e-03, 9.606253355741501e-03, 9.678717428541594e-03, 9.749647363444466e-03, 9.819044600367538e-03, 9.886914188258638e-03, 9.95325855910778e-03]
+time=[0e+00, 5e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Simplified2.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Simplified2.txt
new file mode 100644
index 00000000..63639f5c
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Simplified2.txt
@@ -0,0 +1,16 @@
+last-generated=2017-05-01
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 13, 1, 1, 1, 1, 1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "0, 0, 12, 0, 1, 0, 1, 1, 1",
+ "number of continuous time states": "74",
+ "linear": "24"
+}
+pmpSouth.m_flow=[8.038641248557217e-16, 3.545588970184326e+00, 5.229339122772217e+00, 5.277144432067871e+00, 5.182986736297607e+00, 5.114256858825684e+00, 5.076239109039307e+00, 5.063357353210449e+00, 5.0704026222229e+00, 5.091779232025146e+00, 5.122071266174316e+00, 5.155333518981934e+00, 5.186191558837891e+00, 5.221305370330811e+00, 5.25661563873291e+00, 5.289435386657715e+00, 5.318986892700195e+00, 5.345248222351074e+00, 5.368416309356689e+00, 5.38872241973877e+00, 5.40638256072998e+00, 5.421581745147705e+00, 5.434478282928467e+00, 5.445202827453613e+00, 5.453861713409424e+00, 5.460540771484375e+00, 5.465303421020508e+00, 5.778447151184082e+00, 6.106607913970947e+00, 6.244128704071045e+00, 6.263260364532471e+00, 6.233723640441895e+00, 6.194434642791748e+00, 6.15891695022583e+00, 6.128511905670166e+00, 6.101109027862549e+00, 6.074444770812988e+00, 6.043451309204102e+00, 6.012558460235596e+00, 5.980763912200928e+00, 5.945429801940918e+00, 5.905558586120605e+00, 5.860684394836426e+00, 5.810428619384766e+00, 5.754377365112305e+00, 5.692053318023682e+00, 5.622912406921387e+00, 5.546345710754395e+00, 5.461686611175537e+00, 5.368211269378662e+00, 5.265146255493164e+00, 4.081645011901855e+00, 1.599255084991455e+00, 4.92885559797287e-01, 9.561984986066818e-02, 1.895388402044773e-02, 1.220613624900579e-02, 1.135321334004402e-02, 1.070231758058071e-02, 9.921875782310963e-03, 9.048175066709518e-03, 8.114106953144073e-03, 7.143205497413874e-03, 6.157936528325081e-03, 5.182896740734577e-03, 4.244769923388958e-03, 3.370491554960608e-03, 2.58440850302577e-03, 1.905221957713366e-03, 1.343564712442458e-03, 9.009080240502954e-04, 5.700787296518683e-04, 3.371459315530956e-04, 1.840757759055123e-04, 9.148116805590689e-05, 4.096842894796282e-05, 1.685596726019867e-05, 6.987509550526738e-06, 3.421478368181852e-06, 2.669606146810111e-06, 2.696856654438307e-06, 2.496098886695108e-06, 1.950173555087531e-06, 1.325553853348538e-06, 8.082504905360111e-07, 4.511917381933017e-07, 2.339285885000209e-07, 1.140191656645584e-07, 5.285751569772401e-08, 2.36434747336034e-08, 1.041015984526439e-08, 4.622822125099901e-09, 2.148381028632684e-09, 1.088972578777714e-09, 6.286269838007286e-10, 4.218694837909709e-10, 3.291174832664723e-10, 2.881869187731922e-10, 2.724419301269876e-10, 2.703071377840871e-10, 2.743956450945717e-10]
+pmpNorth.m_flow=[-1.313992615780491e-17, 3.940250158309937e+00, 5.780928134918213e+00, 5.808576107025146e+00, 5.689266204833984e+00, 5.604330062866211e+00, 5.557217597961426e+00, 5.54055643081665e+00, 5.54783821105957e+00, 5.57225227355957e+00, 5.607275009155273e+00, 5.646490097045898e+00, 5.68177604675293e+00, 5.721962928771973e+00, 5.762666702270508e+00, 5.800478935241699e+00, 5.83441162109375e+00, 5.864440441131592e+00, 5.890819549560547e+00, 5.913846492767334e+00, 5.933797836303711e+00, 5.950912475585938e+00, 5.965391635894775e+00, 5.977401733398438e+00, 5.987078189849854e+00, 5.994529247283936e+00, 5.999835968017578e+00, 6.391313552856445e+00, 6.808347225189209e+00, 6.981506824493408e+00, 7.00043773651123e+00, 6.957549571990967e+00, 6.904163360595703e+00, 6.857474803924561e+00, 6.818714618682861e+00, 6.78478479385376e+00, 6.752519607543945e+00, 6.716270446777344e+00, 6.678719043731689e+00, 6.640993118286133e+00, 6.59932279586792e+00, 6.552196025848389e+00, 6.498937606811523e+00, 6.439033508300781e+00, 6.371935367584229e+00, 6.297018527984619e+00, 6.213576793670654e+00, 6.120829582214355e+00, 6.017935752868652e+00, 5.904007434844971e+00, 5.778125286102295e+00, 4.468039512634277e+00, 1.749542355537415e+00, 5.354288220405579e-01, 1.080387309193611e-01, 2.143679745495319e-02, 1.377900410443544e-02, 1.27763394266367e-02, 1.199364010244608e-02, 1.106033939868212e-02, 1.002143789082766e-02, 8.918499574065208e-03, 7.782906293869019e-03, 6.644608918577433e-03, 5.53481187671423e-03, 4.484967328608036e-03, 3.524110652506351e-03, 2.675754018127918e-03, 1.955296145752072e-03, 1.368627301417291e-03, 9.12228599190712e-04, 5.746260867454112e-04, 3.387397737242281e-04, 1.845515362219885e-04, 9.159876208286732e-05, 4.099202487850562e-05, 1.685996176092885e-05, 6.988224413362332e-06, 3.421707560846698e-06, 2.669853301995317e-06, 2.697416675800923e-06, 2.497365812814678e-06, 1.952416596395778e-06, 1.328665916844329e-06, 8.117673928609292e-07, 4.54542174566086e-07, 2.366922160490503e-07, 1.160365670216379e-07, 5.418593218564638e-08, 2.444860491834788e-08, 1.087053380643965e-08, 4.87834306284185e-09, 2.291764777950789e-09, 1.174079500287917e-09, 6.84577783349738e-10, 4.63646565584952e-10, 3.646364876708219e-10, 3.215189781080596e-10, 3.057241126924737e-10, 3.047728458493992e-10, 3.105789514457058e-10]
+time=[0e+00, 1e+03]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Simplified3.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Simplified3.txt
new file mode 100644
index 00000000..466baf35
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Simplified3.txt
@@ -0,0 +1,16 @@
+last-generated=2017-05-01
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 1, 1, 7, 1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "0, 0, 1, 1, 7, 1, 1",
+ "number of continuous time states": "74",
+ "linear": "24"
+}
+pmpSouth.m_flow=[0e+00, 3.545565366744995e+00, 5.229369640350342e+00, 5.277186870574951e+00, 5.183066368103027e+00, 5.114432811737061e+00, 5.076565742492676e+00, 5.06385326385498e+00, 5.071053981781006e+00, 5.092556476593018e+00, 5.122944831848145e+00, 5.156274318695068e+00, 5.18718957901001e+00, 5.222352981567383e+00, 5.25769567489624e+00, 5.290539264678955e+00, 5.32011079788208e+00, 5.346389770507812e+00, 5.36957311630249e+00, 5.389893054962158e+00, 5.407564640045166e+00, 5.422774314880371e+00, 5.43567943572998e+00, 5.4464111328125e+00, 5.455076217651367e+00, 5.461759090423584e+00, 5.466525077819824e+00, 5.778987884521484e+00, 6.106730937957764e+00, 6.244175910949707e+00, 6.263287544250488e+00, 6.233736038208008e+00, 6.194439888000488e+00, 6.158919811248779e+00, 6.128512382507324e+00, 6.101109504699707e+00, 6.074445247650146e+00, 6.043451309204102e+00, 6.012558460235596e+00, 5.980763912200928e+00, 5.945429801940918e+00, 5.905558109283447e+00, 5.860684871673584e+00, 5.810432910919189e+00, 5.754379749298096e+00, 5.692055225372314e+00, 5.622913837432861e+00, 5.546346664428711e+00, 5.461687088012695e+00, 5.368211269378662e+00, 5.265146255493164e+00, 4.081644535064697e+00, 1.599074840545654e+00, 4.9126997590065e-01, 8.913303166627884e-02, 8.185243234038353e-03, 7.014062721282244e-04, 5.776060424977913e-05, 4.589217041939264e-06, 3.648201243322546e-07, 2.753143668599023e-08, 2.049625802413857e-09, 1.41420167243389e-10, 8.957684420607404e-12, 6.33386680777559e-13, 4.108351706793092e-14, 3.712010930025881e-15, 1.622073652645702e-16, 1.708354116101474e-17, 6.206274614427308e-19, 2.768896110653879e-19, 1.222660704046488e-19, 1.328067654996492e-21, -1.46707287297081e-21, 8.572750628638085e-22, 2.517469466290979e-22, -8.65739423625416e-24, -2.994347870238536e-25, -1.552355926404884e-26, -1.725022710378593e-27, -5.860758413683424e-28, -1.170819516994152e-28, -2.119477929244477e-29, -4.33654686651117e-30, -6.317053508974316e-31, -8.334716916609892e-32, -1.069885293482124e-32, -1.257008088225097e-33, -1.271832885740016e-34, -1.487194643261753e-35, -1.520105435859319e-36, 7.105741247177741e-38, 9.647361190610599e-39, 6.124244617574431e-39, -2.231469713544768e-39, -1.046237459434195e-40, 1.50936099669969e-39, -8.108221200245543e-40, -2.508846935468616e-39, -1.097777216952062e-39, 2.23993355626929e-40]
+pmpNorth.m_flow=[0e+00, 3.940224170684814e+00, 5.780961990356445e+00, 5.80862283706665e+00, 5.689352989196777e+00, 5.604521751403809e+00, 5.557573795318604e+00, 5.541097640991211e+00, 5.548549652099609e+00, 5.573101997375488e+00, 5.608231067657471e+00, 5.647521018981934e+00, 5.682868480682373e+00, 5.723110675811768e+00, 5.763851165771484e+00, 5.801689147949219e+00, 5.835644245147705e+00, 5.865693092346191e+00, 5.892088890075684e+00, 5.915131092071533e+00, 5.935095310211182e+00, 5.952221393585205e+00, 5.966710090637207e+00, 5.978728294372559e+00, 5.988410949707031e+00, 5.995866775512695e+00, 6.001176834106445e+00, 6.391909599304199e+00, 6.808483600616455e+00, 6.981559276580811e+00, 7.000467777252197e+00, 6.957563400268555e+00, 6.90416955947876e+00, 6.85747766494751e+00, 6.818714618682861e+00, 6.784785270690918e+00, 6.752520561218262e+00, 6.716270446777344e+00, 6.678719520568848e+00, 6.640993118286133e+00, 6.59932279586792e+00, 6.552195072174072e+00, 6.49893856048584e+00, 6.43903923034668e+00, 6.371938228607178e+00, 6.29702091217041e+00, 6.213578224182129e+00, 6.120830535888672e+00, 6.017936229705811e+00, 5.904006958007812e+00, 5.778124809265137e+00, 4.468039512634277e+00, 1.749344825744629e+00, 5.337029695510864e-01, 1.010797321796417e-01, 9.263459593057632e-03, 7.91931408457458e-04, 6.500627205241472e-05, 5.143219823366962e-06, 4.066976373451325e-07, 3.049389007969694e-08, 2.252878328334873e-09, 1.540881588990572e-10, 9.665774257372473e-12, 6.764000709362505e-13, 4.340856829803535e-14, 3.881208725855243e-15, 1.679408386403059e-16, 1.75325596129269e-17, 6.32205043187541e-19, 2.803585480604939e-19, 1.232038218006454e-19, 1.333239957205649e-21, -1.470243260772682e-21, 8.580761921338276e-22, 2.517091317927452e-22, -8.668232396230992e-24, -2.997482359741625e-25, -1.553825487989649e-26, -1.726602358118979e-27, -5.869087579210412e-28, -1.172727872827797e-28, -2.124114304659036e-29, -4.351204622789088e-30, -6.350567323114e-31, -8.403982333484919e-32, -1.083417657917187e-32, -1.280238703497727e-33, -1.304729164024399e-34, -1.538888557063161e-35, -1.588353917533388e-36, 7.505826532246505e-38, 1.030072360609437e-38, 6.609227009584928e-39, -2.432785856123529e-39, -1.149302961485285e-40, 1.673947705230032e-39, -9.055751195852698e-40, -2.818043441621887e-39, -1.238795486610925e-39, 2.53777954486153e-40]
+time=[0e+00, 1e+03]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Simplified4.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Simplified4.txt
new file mode 100644
index 00000000..a5bf0a64
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Simplified4.txt
@@ -0,0 +1,16 @@
+last-generated=2016-12-02
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 1, 1, 7, 1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "0, 1, 0, 1, 6, 1, 1",
+ "number of continuous time states": "8",
+ "linear": "24"
+}
+pmpSouth.m_flow=[0., 5.01857900619506835938, 4.72824192047119140625, 4.81667661666870117188, 4.89613103866577148438, 4.96747732162475585938, 5.03151273727416992188, 5.0889568328857421875, 5.1404571533203125, 5.18659067153930664062, 5.22787189483642578125, 5.2647571563720703125, 5.29764842987060546875, 5.32690143585205078125, 5.3528270721435546875, 5.375698089599609375, 5.39575147628784179688, 5.4131927490234375, 5.42819881439208984375, 5.44091892242431640625, 5.45147943496704101562, 5.45998382568359375, 5.46651458740234375, 5.47113513946533203125, 5.47388982772827148438, 5.47480535507202148438, 5.47388982772827148438, 6.15340757369995117188, 6.14683055877685546875, 6.13754177093505859375, 6.125457763671875, 6.11047124862670898438, 6.09244775772094726562, 6.07122468948364257812, 6.04660940170288085938, 6.01837825775146484375, 5.98627138137817382812, 5.94999361038208007812, 5.9092082977294921875, 5.863536834716796875, 5.81255388259887695312, 5.7557849884033203125, 5.69270277023315429688, 5.62272596359252929688, 5.5452175140380859375, 5.45948171615600585938, 5.36476945877075195312, 5.26028108596801757812, 5.1451740264892578125, 5.01857900619506835938, 4.87962198257446289062, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+pmpNorth.m_flow=[0., 5.47659635543823242188, 5.13487291336059570312, 5.24134397506713867188, 5.33672428131103515625, 5.4220447540283203125, 5.4982776641845703125, 5.56632375717163085938, 5.62700653076171875, 5.68107080459594726562, 5.7291851043701171875, 5.7719440460205078125, 5.80987501144409179688, 5.843441009521484375, 5.87304925918579101562, 5.89905452728271484375, 5.92176389694213867188, 5.94144296646118164062, 5.95831823348999023438, 5.9725818634033203125, 5.98439455032348632812, 5.99388742446899414062, 6.0011653900146484375, 6.00630807876586914062, 6.00937175750732421875, 6.0103893280029296875, 6.00937175750732421875, 6.84251308441162109375, 6.83491802215576171875, 6.82417964935302734375, 6.81019258499145507812, 6.792816162109375, 6.77187681198120117188, 6.7471637725830078125, 6.71842622756958007812, 6.68536996841430664062, 6.64765644073486328125, 6.60489511489868164062, 6.556644439697265625, 6.50240373611450195312, 6.44161176681518554688, 6.37364435195922851562, 6.29781103134155273438, 6.21335649490356445312, 6.11946249008178710938, 6.0152530670166015625, 5.89980792999267578125, 5.77217817306518554688, 5.63141393661499023438, 5.47659635543823242188, 5.306888580322265625, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+time=[0., 1000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Simplified5.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Simplified5.txt
new file mode 100644
index 00000000..d5fed9bf
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Simplified5.txt
@@ -0,0 +1,16 @@
+last-generated=2016-12-02
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 7, 1, 1, 1, 1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "0, 5, 1, 1, 0, 1, 1",
+ "number of continuous time states": "3",
+ "linear": "27"
+}
+pmpSouth.m_flow=[0., 5.01857900619506835938, 4.72824192047119140625, 4.81667661666870117188, 4.89613103866577148438, 4.96747732162475585938, 5.03151273727416992188, 5.0889568328857421875, 5.1404571533203125, 5.18659067153930664062, 5.22787189483642578125, 5.2647571563720703125, 5.29764842987060546875, 5.32690143585205078125, 5.3528270721435546875, 5.375698089599609375, 5.39575147628784179688, 5.4131927490234375, 5.42819881439208984375, 5.44091892242431640625, 5.45147943496704101562, 5.45998382568359375, 5.46651458740234375, 5.47113513946533203125, 5.47388982772827148438, 5.47480535507202148438, 5.47388982772827148438, 6.15340757369995117188, 6.14683055877685546875, 6.13754177093505859375, 6.125457763671875, 6.11047124862670898438, 6.09244775772094726562, 6.07122468948364257812, 6.04660940170288085938, 6.01837825775146484375, 5.98627138137817382812, 5.94999361038208007812, 5.9092082977294921875, 5.863536834716796875, 5.81255388259887695312, 5.7557849884033203125, 5.69270277023315429688, 5.62272596359252929688, 5.5452175140380859375, 5.45948171615600585938, 5.36476945877075195312, 5.26028108596801757812, 5.1451740264892578125, 5.01857900619506835938, 4.87962198257446289062, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+pmpNorth.m_flow=[0., 5.47659635543823242188, 5.13487291336059570312, 5.24134397506713867188, 5.33672428131103515625, 5.4220447540283203125, 5.4982776641845703125, 5.56632375717163085938, 5.62700653076171875, 5.68107080459594726562, 5.7291851043701171875, 5.7719440460205078125, 5.80987501144409179688, 5.843441009521484375, 5.87304925918579101562, 5.89905452728271484375, 5.92176389694213867188, 5.94144296646118164062, 5.95831823348999023438, 5.9725818634033203125, 5.98439455032348632812, 5.99388742446899414062, 6.0011653900146484375, 6.00630807876586914062, 6.00937175750732421875, 6.0103893280029296875, 6.00937175750732421875, 6.84251308441162109375, 6.83491802215576171875, 6.82417964935302734375, 6.81019258499145507812, 6.792816162109375, 6.77187681198120117188, 6.7471637725830078125, 6.71842622756958007812, 6.68536996841430664062, 6.64765644073486328125, 6.60489511489868164062, 6.556644439697265625, 6.50240373611450195312, 6.44161176681518554688, 6.37364435195922851562, 6.29781103134155273438, 6.21335649490356445312, 6.11946249008178710938, 6.0152530670166015625, 5.89980792999267578125, 5.77217817306518554688, 5.63141393661499023438, 5.47659635543823242188, 5.306888580322265625, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+time=[0., 1000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Simplified6.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Simplified6.txt
new file mode 100644
index 00000000..cc29bf8a
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_FlowSystem_Simplified6.txt
@@ -0,0 +1,16 @@
+last-generated=2017-05-04
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 7, 1, 1, 1, 1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "0, 6, 1, 1, 0, 1, 1",
+ "number of continuous time states": "3",
+ "linear": " "
+}
+pmpSouth.m_flow=[0e+00, 5.018579006195068e+00, 4.728241920471191e+00, 4.816676616668701e+00, 4.896131038665771e+00, 4.967477321624756e+00, 5.03151273727417e+00, 5.088956832885742e+00, 5.140457153320312e+00, 5.186590671539307e+00, 5.227871894836426e+00, 5.26475715637207e+00, 5.297648429870605e+00, 5.326901435852051e+00, 5.352827072143555e+00, 5.375698089599609e+00, 5.395751476287842e+00, 5.413192749023438e+00, 5.42819881439209e+00, 5.440918922424316e+00, 5.451479434967041e+00, 5.459983825683594e+00, 5.466514587402344e+00, 5.471135139465332e+00, 5.473889827728271e+00, 5.474805355072021e+00, 5.473889827728271e+00, 6.153407573699951e+00, 6.146830558776855e+00, 6.137541770935059e+00, 6.125457763671875e+00, 6.110471248626709e+00, 6.092447757720947e+00, 6.071224689483643e+00, 6.046609401702881e+00, 6.018378257751465e+00, 5.986271381378174e+00, 5.94999361038208e+00, 5.909208297729492e+00, 5.863536834716797e+00, 5.812553882598877e+00, 5.75578498840332e+00, 5.692702770233154e+00, 5.622725963592529e+00, 5.545217514038086e+00, 5.459481716156006e+00, 5.364769458770752e+00, 5.260281085968018e+00, 5.145174026489258e+00, 5.018579006195068e+00, 4.879621982574463e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
+pmpNorth.m_flow=[0e+00, 5.476596355438232e+00, 5.134872913360596e+00, 5.241343975067139e+00, 5.336724281311035e+00, 5.42204475402832e+00, 5.49827766418457e+00, 5.566323757171631e+00, 5.627006530761719e+00, 5.681070804595947e+00, 5.729185104370117e+00, 5.771944046020508e+00, 5.809875011444092e+00, 5.843441009521484e+00, 5.873049259185791e+00, 5.899054527282715e+00, 5.921763896942139e+00, 5.941442966461182e+00, 5.95831823348999e+00, 5.97258186340332e+00, 5.984394550323486e+00, 5.993887424468994e+00, 6.001165390014648e+00, 6.006308078765869e+00, 6.009371757507324e+00, 6.01038932800293e+00, 6.009371757507324e+00, 6.842513084411621e+00, 6.834918022155762e+00, 6.824179649353027e+00, 6.810192584991455e+00, 6.792816162109375e+00, 6.771876811981201e+00, 6.747163772583008e+00, 6.71842622756958e+00, 6.685369968414307e+00, 6.647656440734863e+00, 6.604895114898682e+00, 6.556644439697266e+00, 6.502403736114502e+00, 6.441611766815186e+00, 6.373644351959229e+00, 6.297811031341553e+00, 6.213356494903564e+00, 6.119462490081787e+00, 6.015253067016602e+00, 5.899807929992676e+00, 5.772178173065186e+00, 5.63141393661499e+00, 5.476596355438232e+00, 5.306888580322266e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+time=[0e+00, 1e+03]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example1v1.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example1v1.txt
deleted file mode 100644
index 746dd17d..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example1v1.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-last-generated=2015-07-10
-statistics-initialization={'numerical Jacobians': '0', 'nonlinear': '1, 1'}
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1, 1', 'number of continuous time states': '2', 'linear': ' '}
-pump.m_flow=[0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938]
-time=[0., 20.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example1v2.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example1v2.txt
deleted file mode 100644
index 5ffd9aa0..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example1v2.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-last-generated=2015-07-10
-statistics-initialization={'numerical Jacobians': '0', 'nonlinear': '1, 19'}
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1, 19, 1', 'number of continuous time states': '22', 'linear': '0'}
-pump.m_flow=[0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938, 0.10000000149011611938]
-time=[0., 20.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example2.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example2.txt
deleted file mode 100644
index 31022dfb..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example2.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-last-generated=2017-05-01
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "5"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "5",
- "number of continuous time states": "1",
- "linear": " "
-}
-pump_dp.m_flow=[2.885681390762329e-01, 2.885681390762329e-01, 2.885681390762329e-01, -1.987755855857207e-15, 9.525072307504425e-16, 1.852961863875219e-15, 2.885681390762329e-01, 2.885681390762329e-01, 9.062364476632088e-17, 1.431312991769629e-15, 1.29859669346829e-15, 2.885681390762329e-01, 2.885681390762329e-01, -1.126663058542045e-15, 1.187469715719668e-15, 1.562666732192225e-15, 2.885681390762329e-01, 2.885681390762329e-01, 1.509634920674204e-15, 2.162490416519627e-15, 2.158279124877768e-15, 2.885681390762329e-01, 2.885681390762329e-01, 1.125852971655192e-15, -5.19211772130472e-16, -1.638712714922006e-15, 2.885681390762329e-01, 2.885681390762329e-01, 1.262911614575547e-15, 1.459176830272578e-16, -7.284869805169168e-16, 2.885681390762329e-01, 2.885681390762329e-01, 3.420278206171153e-16, 2.174051921663431e-15, 2.240985327671809e-15, 2.885681390762329e-01, 2.885681390762329e-01, -4.895864813795925e-16, 2.649963461700363e-15, 1.121672157214956e-15, 2.885681390762329e-01, 2.885681390762329e-01, 1.514826240661338e-15, 1.684101505173355e-15, 6.115001896771916e-16, 2.885681390762329e-01, 2.885681390762329e-01, -1.780262110066329e-15, 6.871521387169183e-16, 1.292442469710896e-15, 2.885681390762329e-01, 2.885681390762329e-01, 1.514826240661406e-15, 1.684101505173355e-15, 6.115001896771916e-16, 2.885681390762329e-01, 2.885681390762329e-01, -1.780262110066329e-15, 6.871521387168976e-16, 1.292442469710896e-15, 2.885681390762329e-01, 2.885681390762329e-01, 1.514826240661338e-15, 1.684101505173355e-15, 6.115001896771916e-16, 2.885681390762329e-01, 2.885681390762329e-01, -1.780262110066308e-15, 6.871521387168976e-16, 1.292442469710896e-15, 2.885681390762329e-01, 2.885681390762329e-01, 1.514826240661338e-15, 1.684101505173355e-15, 6.115001896771916e-16, 2.885681390762329e-01, 2.885681390762329e-01, -1.780262110066308e-15, 6.871521387169183e-16, 1.292442469710896e-15, 2.885681390762329e-01, 2.885681390762329e-01, -1.314719914426949e-16, 2.564051095854039e-15, 7.211435225015772e-16, 2.885681390762329e-01, 2.885681390762329e-01, 1.291528230783825e-15, -1.040837407423778e-15, -1.463362389401144e-15, 2.885681390762329e-01, 2.885681390762329e-01, -5.773958682209893e-16, 1.371783945146607e-15, 1.71081893565587e-15, 2.885681390762329e-01, 2.885681390762329e-01, -1.749190583981043e-15, -2.783425481387004e-16, 9.015433290583772e-16]
-time=[0e+00, 2e+01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example3.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example3.txt
deleted file mode 100644
index 441aad4b..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example3.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-last-generated=2015-07-10
-statistics-initialization={'numerical Jacobians': '0', 'nonlinear': '1'}
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1', 'number of continuous time states': '1', 'linear': ' '}
-pump.m_flow=[1., 1., 1., 0., 0., 0., 1., 1., 0., 0., 0., 1., 1., 0., 0., 0., 1., 1., 0., 0., 0., 1., 1., 0., 0., 0., 1., 1., 0., 0., 0., 1., 1., 0., 0., 0., 1., 1., 0., 0., 0., 1., 1., 0., 0., 0., 1., 1., 0., 0., 0., 1., 1., 0., 0., 0., 1., 1., 0., 0., 0., 1., 1., 0., 0., 0., 1., 1., 0., 0., 0., 1., 1., 0., 0., 0., 1., 1., 0., 0., 0., 1., 1., 0., 0., 0., 1., 1., 0., 0., 0., 1., 1., 0., 0., 0., 1., 1., 0., 0., 0.]
-time=[0., 20.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example4.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example4.txt
deleted file mode 100644
index 1ccb05a9..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example4.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-last-generated=2015-07-27
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-res.m_flow=[3.16227769851684570312, 3.16227769851684570312]
-time=[0., 20.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example5.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example5.txt
deleted file mode 100644
index 623e5224..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example5.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-last-generated=2017-03-31
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "1",
- "linear": " "
-}
-c=[0e+00, 1.195940194306918e-01, 4.736247228063916e-01, 1.047977130700992e+00, 1.81975109315639e+00, 2.758177995681763e+00, 3.825845453870012e+00, 4.980189941680349e+00, 6.175189828888455e+00, 7.363205710137668e+00, 8.49687385559082e+00, 9.530995134340634e+00, 1.042434366797277e+01, 1.114130334752093e+01, 1.165329751474073e+01, 1.193991470336914e+01, 1.198972417022629e+01, 1.180073942345303e+01, 1.138049480800232e+01, 1.074574547934009e+01, 9.921795845031738e+00, 8.941493933317307e+00, 7.843924586413609e+00, 6.672839071842554e+00, 5.474929997617617e+00, 4.297949314117432e+00, 3.188822461491054e+00, 2.191768380308276e+00, 1.346532111784316e+00, 6.868119989618019e-01, 2.389075458049774e-01, 2.067753338729647e-02, 4.082112816484326e-02, 2.985361917273333e-01, 7.835467367970003e-01, 1.476519465446472e+00, 2.349826542613721e+00, 3.368649688892077e+00, 4.492375930416375e+00, 5.676201156005216e+00, 6.872934818267822e+00, 8.034865494189139e+00, 9.115665460174593e+00, 1.007224293266718e+01, 1.086647346385078e+01, 1.146669006347656e+01, 1.184896683120519e+01, 1.199805642266621e+01, 1.190801846602187e+01, 1.158244172796041e+01, 1.103430557250977e+01, 1.028546251604361e+01, 9.36576746635545e+00, 8.311888881300717e+00, 7.165834591055198e+00, 5.973297119140625e+00, 4.781820135278234e+00, 3.638903439604584e+00, 2.590116740737361e+00, 1.677261685650914e+00, 9.367326498031616e-01, 3.980545689063324e-01, 8.27046275035823e-02, 3.251927445048143e-03, 1.628642487350231e-01, 5.551797747612e-01, 1.164557914389078e+00, 1.966704662983657e+00, 2.92963596641218e+00, 4.014971614651921e+00, 5.179439067840576e+00, 6.376613803680986e+00, 7.558769039620798e+00, 8.678768951080047e+00, 9.691971816622793e+00, 1.055798053741455e+01, 1.12422729135074e+01, 1.171756618647913e+01, 1.196491116881925e+01, 1.197444637906036e+01, 1.174579238891602e+01, 1.128806703795964e+01, 1.061951106264463e+01, 9.766790234931172e+00, 8.763884255087101e+00, 7.650793075561523e+00, 6.4718845140427e+00, 5.274146198376029e+00, 4.105349342081344e+00, 3.01206983227141e+00, 2.037914037704468e+00, 1.221705535689136e+00, 5.95976472444061e-01, 1.856864675954771e-01, 7.184632831167236e-03, 6.759153306484222e-02, 3.644960274370972e-01, 8.860674938189443e-01, 1.611502670156082e+00, 2.511894188212824e+00, 3.551329135894775e+00]
-time=[0e+00, 2e+01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example6.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example6.txt
deleted file mode 100644
index 9cbab749..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example6.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-last-generated=2017-03-31
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "500",
- "linear": " "
-}
-T[2]=[2.731499938964844e+02, 2.73217529296875e+02, 2.733846740722656e+02, 2.734469909667969e+02, 2.733081970214844e+02, 2.730752868652344e+02, 2.729501647949219e+02, 2.730390014648438e+02, 2.732546081542969e+02, 2.7339453125e+02, 2.733270874023438e+02, 2.731118774414062e+02, 2.729448547363281e+02, 2.729780578613281e+02, 2.731797180175781e+02, 2.733633728027344e+02, 2.733592834472656e+02, 2.731705017089844e+02, 2.729698791503906e+02, 2.729413757324219e+02, 2.731106872558594e+02, 2.733216857910156e+02, 2.733800354003906e+02, 2.732317504882812e+02, 2.730128173828125e+02, 2.7292431640625e+02, 2.730473022460938e+02, 2.732685241699219e+02, 2.733843688964844e+02, 2.732881469726562e+02, 2.730681457519531e+02, 2.729264831542969e+02, 2.729932556152344e+02, 2.732069396972656e+02, 2.733709411621094e+02, 2.733343811035156e+02, 2.731307373046875e+02, 2.729471740722656e+02, 2.729523315429688e+02, 2.731413879394531e+02, 2.733404541015625e+02, 2.733664245605469e+02, 2.731953735351562e+02, 2.729844665527344e+02, 2.729275512695312e+02, 2.730769348144531e+02, 2.73295166015625e+02, 2.733815612792969e+02, 2.732566833496094e+02, 2.730352172851562e+02, 2.729208068847656e+02, 2.730185546875e+02, 2.732385559082031e+02, 2.733785095214844e+02, 2.733096923828125e+02, 2.730953674316406e+02, 2.729324951171875e+02, 2.729708251953125e+02, 2.731750793457031e+02, 2.73357421875e+02, 2.733501892089844e+02, 2.731600036621094e+02, 2.729617004394531e+02, 2.729375610351562e+02, 2.731097717285156e+02, 2.733199768066406e+02, 2.733748779296875e+02, 2.732239990234375e+02, 2.730060119628906e+02, 2.729213256835938e+02, 2.730477905273438e+02, 2.732691040039062e+02, 2.733817749023438e+02, 2.732821960449219e+02, 2.730619201660156e+02, 2.729234313964844e+02, 2.729940490722656e+02, 2.732088317871094e+02, 2.733703002929688e+02, 2.733299560546875e+02, 2.731249389648438e+02, 2.729436645507812e+02, 2.729527893066406e+02, 2.731439514160156e+02, 2.733413391113281e+02, 2.733634948730469e+02, 2.731900024414062e+02, 2.729803771972656e+02, 2.729273681640625e+02, 2.730796203613281e+02, 2.732972412109375e+02, 2.733800659179688e+02, 2.732519836425781e+02, 2.730307006835938e+02, 2.729197082519531e+02, 2.7302099609375e+02, 2.73241455078125e+02, 2.733783874511719e+02, 2.733058776855469e+02, 2.730906066894531e+02, 2.72930419921875e+02]
-time=[0e+00, 1e+02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example7.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example7.txt
deleted file mode 100644
index 9cbab749..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example7.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-last-generated=2017-03-31
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "500",
- "linear": " "
-}
-T[2]=[2.731499938964844e+02, 2.73217529296875e+02, 2.733846740722656e+02, 2.734469909667969e+02, 2.733081970214844e+02, 2.730752868652344e+02, 2.729501647949219e+02, 2.730390014648438e+02, 2.732546081542969e+02, 2.7339453125e+02, 2.733270874023438e+02, 2.731118774414062e+02, 2.729448547363281e+02, 2.729780578613281e+02, 2.731797180175781e+02, 2.733633728027344e+02, 2.733592834472656e+02, 2.731705017089844e+02, 2.729698791503906e+02, 2.729413757324219e+02, 2.731106872558594e+02, 2.733216857910156e+02, 2.733800354003906e+02, 2.732317504882812e+02, 2.730128173828125e+02, 2.7292431640625e+02, 2.730473022460938e+02, 2.732685241699219e+02, 2.733843688964844e+02, 2.732881469726562e+02, 2.730681457519531e+02, 2.729264831542969e+02, 2.729932556152344e+02, 2.732069396972656e+02, 2.733709411621094e+02, 2.733343811035156e+02, 2.731307373046875e+02, 2.729471740722656e+02, 2.729523315429688e+02, 2.731413879394531e+02, 2.733404541015625e+02, 2.733664245605469e+02, 2.731953735351562e+02, 2.729844665527344e+02, 2.729275512695312e+02, 2.730769348144531e+02, 2.73295166015625e+02, 2.733815612792969e+02, 2.732566833496094e+02, 2.730352172851562e+02, 2.729208068847656e+02, 2.730185546875e+02, 2.732385559082031e+02, 2.733785095214844e+02, 2.733096923828125e+02, 2.730953674316406e+02, 2.729324951171875e+02, 2.729708251953125e+02, 2.731750793457031e+02, 2.73357421875e+02, 2.733501892089844e+02, 2.731600036621094e+02, 2.729617004394531e+02, 2.729375610351562e+02, 2.731097717285156e+02, 2.733199768066406e+02, 2.733748779296875e+02, 2.732239990234375e+02, 2.730060119628906e+02, 2.729213256835938e+02, 2.730477905273438e+02, 2.732691040039062e+02, 2.733817749023438e+02, 2.732821960449219e+02, 2.730619201660156e+02, 2.729234313964844e+02, 2.729940490722656e+02, 2.732088317871094e+02, 2.733703002929688e+02, 2.733299560546875e+02, 2.731249389648438e+02, 2.729436645507812e+02, 2.729527893066406e+02, 2.731439514160156e+02, 2.733413391113281e+02, 2.733634948730469e+02, 2.731900024414062e+02, 2.729803771972656e+02, 2.729273681640625e+02, 2.730796203613281e+02, 2.732972412109375e+02, 2.733800659179688e+02, 2.732519836425781e+02, 2.730307006835938e+02, 2.729197082519531e+02, 2.7302099609375e+02, 2.73241455078125e+02, 2.733783874511719e+02, 2.733058776855469e+02, 2.730906066894531e+02, 2.72930419921875e+02]
-time=[0e+00, 1e+02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example8.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example8.txt
deleted file mode 100644
index c1a8094e..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_Example8.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-last-generated=2015-07-10
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-a=[0.84147095680236816406, 0.9974949955940246582, 0.90929740667343139648, 0.59847211837768554688, 0.14112000167369842529, -0.35078322887420654297, -0.75680249929428100586, -0.97753012180328380243, -0.95892429351806640625, -0.70554029941558837891, -0.27941548824310302734, 0.21511998772621154785, 0.65698659420013427734, 0.93799996376037597656, 0.98935824632644631116, 0.79848712682723999023, 0.41211849451065063477, -0.07515112310647964478, -0.54402112960815429688, -0.87969577312469482422, -0.99999022483825683594, -0.87545216083526611328, -0.53657293319702148438, -0.06632189452648162842, 0.42016702890396118164, 0.80378443002700805664, 0.99060738086700439453, 0.93489503860473632812, 0.65028786659240578327, 0.20646747946739368862, -0.28790330886840820312, -0.71178531646728515625, -0.96139746904373168945, -0.9756259918212890625, -0.75098723173141479492, -0.34248062968254089355, 0.149877205491065979, 0.60553985834121704102, 0.91294527053833007812, 0.99682980775833129883, 0.83665561676025390625, 0.4716390073299407959, -0.00885130930691957474, -0.48717451095581054688, -0.84622043371200561523, -0.99808204174041748047, -0.90557837486267089844, -0.5913575291633605957, -0.13235175609588623047, 0.3590583503246307373, 0.76255846023559570312, 0.97935765981674194336, 0.95637595653533935547, 0.69924002885818481445, 0.2709057927131652832, -0.22375564277172430017, -0.66363388299942271953, -0.94103139638900623609, -0.98803162574768099713, -0.79312723875045776367, -0.40403765439987182617, 0.08397445827722549438, 0.55142670869827270508, 0.8838704228401184082, 0.99991184473037719727, 0.87114000320434570312, 0.52908271551132202148, 0.05748747661709785461, -0.42818266153335571289, -0.80901879072189331055, -0.99177885055541992188, -0.93171685934066772461, -0.64353811740875244141, -0.19779880344867706299, 0.29636856913566589355, 0.71797460317611694336, 0.9637953639030456543, 0.97364544868469238281, 0.74511313438415527344, 0.33415117859840393066, -0.15862266719341278076, -0.61256015300750732422, -0.91652154922485351562, -0.99608647823333740234, -0.83177477121353149414, -0.46381551027297973633, 0.01770192570984363556, 0.49488532543182373047, 0.85090351104736328125, 0.99859088659286499023, 0.90178835391998291016, 0.58419656753540039062, 0.12357312440872192383, -0.36730533838272094727, -0.76825463771820068359, -0.98110842704772949219, -0.95375263690948486328, -0.69288498163223266602, -0.2623748481273651123, 0.23237375915050506592, 0.67022919654846191406]
-b=[0.84147095680236816406, 0.9974949955940246582, 0.90929740667343139648, 0.59847211837768554688, 0.14112000167369842529, -0.35078322887420654297, -0.75680249929428100586, -0.97753012180328380243, -0.95892429351806640625, -0.70554029941558837891, -0.27941548824310302734, 0.21511998772621154785, 0.65698659420013427734, 0.93799996376037597656, 0.98935824632644631116, 0.79848712682723999023, 0.41211849451065063477, -0.07515112310647964478, -0.54402112960815429688, -0.87969577312469482422, -0.99999022483825683594, -0.87545216083526611328, -0.53657293319702148438, -0.06632189452648162842, 0.42016702890396118164, 0.80378443002700805664, 0.99060738086700439453, 0.93489503860473632812, 0.65028786659240578327, 0.20646747946739368862, -0.28790330886840820312, -0.71178531646728515625, -0.96139746904373168945, -0.9756259918212890625, -0.75098723173141479492, -0.34248062968254089355, 0.149877205491065979, 0.60553985834121704102, 0.91294527053833007812, 0.99682980775833129883, 0.83665561676025390625, 0.4716390073299407959, -0.00885130930691957474, -0.48717451095581054688, -0.84622043371200561523, -0.99808204174041748047, -0.90557837486267089844, -0.5913575291633605957, -0.13235175609588623047, 0.3590583503246307373, 0.76255846023559570312, 0.97935765981674194336, 0.95637595653533935547, 0.69924002885818481445, 0.2709057927131652832, -0.22375564277172430017, -0.66363388299942271953, -0.94103139638900623609, -0.98803162574768099713, -0.79312723875045776367, -0.40403765439987182617, 0.08397445827722549438, 0.55142670869827270508, 0.8838704228401184082, 0.99991184473037719727, 0.87114000320434570312, 0.52908271551132202148, 0.05748747661709785461, -0.42818266153335571289, -0.80901879072189331055, -0.99177885055541992188, -0.93171685934066772461, -0.64353811740875244141, -0.19779880344867706299, 0.29636856913566589355, 0.71797460317611694336, 0.9637953639030456543, 0.97364544868469238281, 0.74511313438415527344, 0.33415117859840393066, -0.15862266719341278076, -0.61256015300750732422, -0.91652154922485351562, -0.99608647823333740234, -0.83177477121353149414, -0.46381551027297973633, 0.01770192570984363556, 0.49488532543182373047, 0.85090351104736328125, 0.99859088659286499023, 0.90178835391998291016, 0.58419656753540039062, 0.12357312440872192383, -0.36730533838272094727, -0.76825463771820068359, -0.98110842704772949219, -0.95375263690948486328, -0.69288498163223266602, -0.2623748481273651123, 0.23237375915050506592, 0.67022919654846191406]
-time=[0., 50.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_ParallelDp.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_ParallelDp.txt
deleted file mode 100644
index 8c3b418c..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_ParallelDp.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2017-05-26
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 1, 1, 1, 1, 1, 1, 1, 1, 1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
- "linear": " "
-}
-sin.ports[1].m_flow=[7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_ParallelDpOptimised.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_ParallelDpOptimised.txt
deleted file mode 100644
index a9ca96c2..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_ParallelDpOptimised.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-last-generated=2017-05-26
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-sin.ports[1].m_flow=[7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 7.560477733612061e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_ParallelFlow.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_ParallelFlow.txt
deleted file mode 100644
index 1219e40a..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_ParallelFlow.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2017-05-26
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "9"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "9",
- "linear": " "
-}
-sin.ports[1].m_flow=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_ParallelFlowOptimised.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_ParallelFlowOptimised.txt
deleted file mode 100644
index fdaa60a8..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_ParallelFlowOptimised.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2017-05-26
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1",
- "linear": " "
-}
-sin.ports[1].m_flow=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesDp.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesDp.txt
deleted file mode 100644
index 9b2555b5..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesDp.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2017-05-26
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "9"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "9",
- "linear": " "
-}
-sin.ports[1].m_flow=[2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, 2.079205363988876e-01, -1.222750883963607e-12, -8.988340179521145e-13, -6.955005052569251e-13, -5.112573952182372e-13, -3.95601156502513e-13, -3.061085377303159e-13, -2.25017853622172e-13, -1.741144885570388e-13, -1.347264379356187e-13, -1.042488825589709e-13, -8.06657765300273e-14, -6.241762854617801e-14, -4.829755331558678e-14, -3.550313611823824e-14, -2.747164226793641e-14, -2.125706034116019e-14, -1.644830455141218e-14, -1.272738054761402e-14, -9.848202463032361e-15, -7.620349120728619e-15, -5.89647947991076e-15, -4.562589604179889e-15, -3.530443778264328e-15, -2.731789513656352e-15, -2.113806083498654e-15, -1.635622454653292e-15, -1.20233251977109e-15, -9.303417838432094e-16, -7.198816381442539e-16, -5.570305343178181e-16, -4.310195185171855e-16, -3.33514610543172e-16, -2.580671938428115e-16, -1.996874231707815e-16, -1.545145104576286e-16, -1.195603601692604e-16, -9.251349935576933e-17, -7.158516782382564e-17, -5.539122332054049e-17, -4.28606621477228e-17, -3.316480715364204e-17, -2.566228888640232e-17, -1.985698553947027e-17, -1.536495340859172e-17, -1.188910476008243e-17, -9.19956034817346e-18, -7.118453704503719e-18, -5.508122363040385e-18, -4.262078954303589e-18, -3.297914715123646e-18]
-time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesDpOptimised.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesDpOptimised.txt
deleted file mode 100644
index e36cc574..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesDpOptimised.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2017-05-26
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1",
- "linear": " "
-}
-sin.ports[1].m_flow=[2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, 2.223958224058151e-01, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13, -9.464458296942757e-13]
-time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesFlow.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesFlow.txt
deleted file mode 100644
index 5f1520f5..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesFlow.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2017-06-04
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 1, 1, 1, 1, 1, 1, 1, 1, 1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
- "linear": " "
-}
-sin.ports[1].m_flow=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesFlowOptimised.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesFlowOptimised.txt
deleted file mode 100644
index dcb6428a..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesFlowOptimised.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-last-generated=2017-06-04
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-sin.ports[1].m_flow=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesParallelDp.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesParallelDp.txt
deleted file mode 100644
index 8da5c875..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesParallelDp.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2017-05-26
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "10"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "10",
- "linear": " "
-}
-sin.ports[1].m_flow=[9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 9.880632162094116e-01, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11, 5.158232174728994e-11]
-time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesParallelDpOptimised.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesParallelDpOptimised.txt
deleted file mode 100644
index 87dc182b..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesParallelDpOptimised.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2017-05-26
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1",
- "linear": " "
-}
-sin.ports[1].m_flow=[9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 9.816989898681641e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesParallelFlow.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesParallelFlow.txt
deleted file mode 100644
index 45870f07..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesParallelFlow.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2017-05-26
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "9, 1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "9, 0",
- "linear": " "
-}
-sin.ports[1].m_flow=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesParallelFlowOptimised.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesParallelFlowOptimised.txt
deleted file mode 100644
index fdaa60a8..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_Performance_PressureDrop_SeriesParallelFlowOptimised.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2017-05-26
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1",
- "linear": " "
-}
-sin.ports[1].m_flow=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_ResistanceVolumeFlowReversal.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_ResistanceVolumeFlowReversal.txt
deleted file mode 100644
index 76535453..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_ResistanceVolumeFlowReversal.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-last-generated=2017-05-04
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 9"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 9, 1",
- "number of continuous time states": "4",
- "linear": " "
-}
-res[2].m_flow=[9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-res[1].m_flow=[9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-time=[0e+00, 1e+04]
-vol[2].T=[2.931499938964844e+02, 2.932289733886719e+02, 2.933065185546875e+02, 2.933840637207031e+02, 2.934616088867188e+02, 2.935391235351562e+02, 2.935391235351562e+02, 2.935391235351562e+02, 2.935391235351562e+02, 2.935391235351562e+02, 2.935391235351562e+02, 2.936166687011719e+02, 2.936942138671875e+02, 2.937717590332031e+02, 2.938493041992188e+02, 2.939268493652344e+02, 2.939268493652344e+02, 2.939268493652344e+02, 2.939267578125e+02, 2.939267578125e+02, 2.939267578125e+02, 2.9400439453125e+02, 2.940819396972656e+02, 2.941594848632812e+02, 2.942370300292969e+02, 2.943145446777344e+02, 2.943145446777344e+02, 2.943145446777344e+02, 2.943145446777344e+02, 2.943145446777344e+02, 2.943145446777344e+02, 2.9439208984375e+02, 2.944696350097656e+02, 2.945471801757812e+02, 2.946247253417969e+02, 2.947022705078125e+02, 2.947022705078125e+02, 2.947022705078125e+02, 2.947022705078125e+02, 2.947022705078125e+02, 2.947022705078125e+02, 2.947798156738281e+02, 2.948573608398438e+02, 2.949349060058594e+02, 2.950124206542969e+02, 2.950899658203125e+02, 2.950899658203125e+02, 2.950899963378906e+02, 2.950899963378906e+02, 2.950899963378906e+02, 2.950899963378906e+02, 2.951675109863281e+02, 2.952450561523438e+02, 2.953226013183594e+02, 2.95400146484375e+02, 2.954776916503906e+02, 2.954776916503906e+02, 2.954776916503906e+02, 2.954776916503906e+02, 2.954776916503906e+02, 2.954776916503906e+02, 2.955552368164062e+02, 2.956327819824219e+02, 2.957103271484375e+02, 2.95787841796875e+02, 2.958653869628906e+02, 2.958653869628906e+02, 2.958653869628906e+02, 2.958653869628906e+02, 2.958653869628906e+02, 2.958653869628906e+02, 2.959429321289062e+02, 2.960204772949219e+02, 2.960980224609375e+02, 2.961755676269531e+02, 2.962531127929688e+02, 2.962531127929688e+02, 2.962531127929688e+02, 2.962531127929688e+02, 2.962531127929688e+02, 2.962531127929688e+02, 2.963306579589844e+02, 2.96408203125e+02, 2.964857482910156e+02, 2.965632629394531e+02, 2.966408081054688e+02, 2.966408081054688e+02, 2.966408081054688e+02, 2.966408081054688e+02, 2.966408081054688e+02, 2.966408081054688e+02, 2.967183532714844e+02, 2.967958984375e+02, 2.968734436035156e+02, 2.969509887695312e+02, 2.970285339355469e+02, 2.970285339355469e+02, 2.970285339355469e+02, 2.970285339355469e+02, 2.970285339355469e+02, 2.970285339355469e+02]
-vol[1].T=[2.931499938964844e+02, 2.932289733886719e+02, 2.933065185546875e+02, 2.933840637207031e+02, 2.934616088867188e+02, 2.935391235351562e+02, 2.935391235351562e+02, 2.935391235351562e+02, 2.935391235351562e+02, 2.935391235351562e+02, 2.935391235351562e+02, 2.936166687011719e+02, 2.936942138671875e+02, 2.937717590332031e+02, 2.938493041992188e+02, 2.939268493652344e+02, 2.939268493652344e+02, 2.939268493652344e+02, 2.939268493652344e+02, 2.939268493652344e+02, 2.939268493652344e+02, 2.9400439453125e+02, 2.940819396972656e+02, 2.941594848632812e+02, 2.942370300292969e+02, 2.943145446777344e+02, 2.943145446777344e+02, 2.943145446777344e+02, 2.943145446777344e+02, 2.943145446777344e+02, 2.943145446777344e+02, 2.9439208984375e+02, 2.944696350097656e+02, 2.945471801757812e+02, 2.946247253417969e+02, 2.947022705078125e+02, 2.947022705078125e+02, 2.947022705078125e+02, 2.947022705078125e+02, 2.947022705078125e+02, 2.947022705078125e+02, 2.947798156738281e+02, 2.948573608398438e+02, 2.949349060058594e+02, 2.950124206542969e+02, 2.950899658203125e+02, 2.950899658203125e+02, 2.950899658203125e+02, 2.950899658203125e+02, 2.950899658203125e+02, 2.950899658203125e+02, 2.951675109863281e+02, 2.952450561523438e+02, 2.953226013183594e+02, 2.95400146484375e+02, 2.954776916503906e+02, 2.954776916503906e+02, 2.954776916503906e+02, 2.954776916503906e+02, 2.954776916503906e+02, 2.954776916503906e+02, 2.955552368164062e+02, 2.956327819824219e+02, 2.957103271484375e+02, 2.95787841796875e+02, 2.958653869628906e+02, 2.958653869628906e+02, 2.958653869628906e+02, 2.958653869628906e+02, 2.958653869628906e+02, 2.958653869628906e+02, 2.959429321289062e+02, 2.960204772949219e+02, 2.960980224609375e+02, 2.961755676269531e+02, 2.962531127929688e+02, 2.962531127929688e+02, 2.962531127929688e+02, 2.962531127929688e+02, 2.962531127929688e+02, 2.962531127929688e+02, 2.963306579589844e+02, 2.96408203125e+02, 2.964857482910156e+02, 2.965632629394531e+02, 2.966408081054688e+02, 2.966408081054688e+02, 2.966408081054688e+02, 2.966408081054688e+02, 2.966408081054688e+02, 2.966408081054688e+02, 2.967183532714844e+02, 2.967958984375e+02, 2.968734436035156e+02, 2.969509887695312e+02, 2.970285339355469e+02, 2.970285339355469e+02, 2.970285339355469e+02, 2.970285339355469e+02, 2.970285339355469e+02, 2.970285339355469e+02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_SimpleHouse.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_SimpleHouse.txt
deleted file mode 100644
index 823487d9..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Examples_SimpleHouse.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-last-generated=2017-05-02
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "5"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1",
- "number of continuous time states": "10",
- "linear": "0, 0, 0, 0, 0"
-}
-zone.T=[2.931499938964844e+02, 2.932999572753906e+02, 2.938196716308594e+02, 2.946534729003906e+02, 2.933469543457031e+02, 2.948510437011719e+02, 2.9495654296875e+02, 2.948139343261719e+02, 2.941944580078125e+02, 2.951498413085938e+02, 2.945299377441406e+02, 2.940122985839844e+02, 2.951308288574219e+02, 2.933596801757812e+02, 2.949378356933594e+02, 2.949982299804688e+02, 2.950543518066406e+02, 2.934606628417969e+02, 2.933508911132812e+02, 2.933690795898438e+02, 2.940606994628906e+02, 2.9381689453125e+02, 2.941665954589844e+02, 2.951101379394531e+02, 2.93721435546875e+02, 2.932664489746094e+02, 2.949935607910156e+02, 2.933595886230469e+02, 2.938836669921875e+02, 2.955366821289062e+02, 2.960251770019531e+02, 2.951156921386719e+02, 2.950512084960938e+02, 2.945024719238281e+02, 2.954201354980469e+02, 2.957059020996094e+02, 2.955554504394531e+02, 2.956882629394531e+02, 2.95537353515625e+02, 2.961585388183594e+02, 2.966767272949219e+02, 2.969848327636719e+02, 2.971362915039062e+02, 2.9726904296875e+02, 2.971913146972656e+02, 2.970225524902344e+02, 2.972713623046875e+02, 2.972726440429688e+02, 2.972508239746094e+02, 2.972774658203125e+02, 2.970592956542969e+02, 2.972693176269531e+02, 2.972654418945312e+02, 2.971258239746094e+02, 2.972723083496094e+02, 2.972996215820312e+02, 2.972721557617188e+02, 2.972756652832031e+02, 2.972812194824219e+02, 2.972701416015625e+02, 2.972513122558594e+02, 2.972555541992188e+02, 2.969852294921875e+02, 2.971997680664062e+02, 2.972363586425781e+02, 2.969234008789062e+02, 2.968839416503906e+02, 2.967979736328125e+02, 2.968892822265625e+02, 2.968612365722656e+02, 2.965563659667969e+02, 2.962307434082031e+02, 2.95669677734375e+02, 2.952453918457031e+02, 2.955816040039062e+02, 2.955872192382812e+02, 2.950529174804688e+02, 2.941620483398438e+02, 2.943087768554688e+02, 2.943316955566406e+02, 2.933301086425781e+02, 2.937826538085938e+02, 2.935924987792969e+02, 2.935029602050781e+02, 2.936851196289062e+02, 2.932078857421875e+02, 2.950301818847656e+02, 2.935578002929688e+02, 2.94077880859375e+02, 2.950599060058594e+02, 2.949207458496094e+02, 2.948160705566406e+02, 2.95083251953125e+02, 2.939211120605469e+02, 2.948829650878906e+02, 2.950764770507812e+02, 2.950697937011719e+02, 2.949950256347656e+02, 2.944744262695312e+02, 2.950241394042969e+02, 2.948709716796875e+02]
-time=[0e+00, 3.1536e+07]
-heaWat.u=[1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-vavDam.y=[1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.19055300951004e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.213608458638191e-01, 1.226584538817406e-01, 1.008262559771538e-01, 1.274740844964981e-01, 1.000000014901161e-01, 1.193100959062576e-01, 1.154371425509453e-01, 1.000000014901161e-01, 1.22311033308506e-01, 1.496256738901138e-01, 1.221455112099648e-01, 1.256541758775711e-01, 1.312125772237778e-01, 1.201446950435638e-01, 1.013098284602165e-01, 1.055680364370346e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01]
-fan.sta_b.T=[2.886552734375e+02, 2.904588623046875e+02, 2.878003540039062e+02, 2.920339965820312e+02, 2.909736633300781e+02, 2.921861572265625e+02, 2.912510375976562e+02, 2.903096008300781e+02, 2.887930603027344e+02, 2.918000793457031e+02, 2.898281860351562e+02, 2.909383850097656e+02, 2.92034912109375e+02, 2.90496826171875e+02, 2.906281127929688e+02, 2.922212524414062e+02, 2.918369445800781e+02, 2.90767333984375e+02, 2.914960327148438e+02, 2.917686462402344e+02, 2.911693420410156e+02, 2.921475830078125e+02, 2.914042663574219e+02, 2.922450256347656e+02, 2.928440551757812e+02, 2.910792236328125e+02, 2.920715026855469e+02, 2.918490295410156e+02, 2.920862121582031e+02, 2.963508911132812e+02, 2.940991821289062e+02, 2.935661010742188e+02, 2.933595886230469e+02, 2.939568481445312e+02, 2.9476806640625e+02, 2.943227844238281e+02, 2.94743896484375e+02, 2.9354638671875e+02, 2.952123718261719e+02, 2.961461791992188e+02, 2.948929748535156e+02, 2.980906066894531e+02, 2.96609619140625e+02, 2.980160522460938e+02, 2.962867736816406e+02, 2.965219421386719e+02, 2.963284301757812e+02, 2.985795288085938e+02, 2.949618835449219e+02, 2.974532165527344e+02, 2.972281494140625e+02, 2.9737255859375e+02, 2.969470825195312e+02, 2.979117126464844e+02, 2.977032165527344e+02, 2.980174560546875e+02, 2.98170166015625e+02, 2.968270568847656e+02, 2.98050048828125e+02, 2.977490539550781e+02, 2.958913879394531e+02, 2.975402221679688e+02, 2.966894836425781e+02, 2.963917541503906e+02, 2.980618896484375e+02, 2.965276489257812e+02, 2.9672509765625e+02, 2.966694030761719e+02, 2.963467712402344e+02, 2.965514221191406e+02, 2.957956848144531e+02, 2.960138854980469e+02, 2.94507568359375e+02, 2.951829528808594e+02, 2.946804504394531e+02, 2.94806884765625e+02, 2.944578857421875e+02, 2.922934875488281e+02, 2.932570190429688e+02, 2.925088500976562e+02, 2.915533752441406e+02, 2.924066772460938e+02, 2.915720825195312e+02, 2.919306640625e+02, 2.939968566894531e+02, 2.925294799804688e+02, 2.923384094238281e+02, 2.924598083496094e+02, 2.916119995117188e+02, 2.91682373046875e+02, 2.90910400390625e+02, 2.902037963867188e+02, 2.919536743164062e+02, 2.917670593261719e+02, 2.908406982421875e+02, 2.920327453613281e+02, 2.911068115234375e+02, 2.912257690429688e+02, 2.911378784179688e+02, 2.913525390625e+02, 2.911005859375e+02]
-fan.sta_a.T=[2.883200073242188e+02, 2.901235961914062e+02, 2.87465087890625e+02, 2.9169873046875e+02, 2.906383972167969e+02, 2.918508911132812e+02, 2.90915771484375e+02, 2.899743347167969e+02, 2.884577941894531e+02, 2.914648132324219e+02, 2.894929504394531e+02, 2.906031188964844e+02, 2.916996459960938e+02, 2.901615905761719e+02, 2.902928466796875e+02, 2.918860168457031e+02, 2.91501708984375e+02, 2.904320678710938e+02, 2.911607666015625e+02, 2.914333801269531e+02, 2.908340759277344e+02, 2.918123168945312e+02, 2.910690002441406e+02, 2.919097595214844e+02, 2.925087890625e+02, 2.907439880371094e+02, 2.917362670898438e+02, 2.915137634277344e+02, 2.917509460449219e+02, 2.96015625e+02, 2.93763916015625e+02, 2.932308349609375e+02, 2.930243225097656e+02, 2.936216125488281e+02, 2.944328002929688e+02, 2.939875183105469e+02, 2.944086303710938e+02, 2.932111206054688e+02, 2.948771362304688e+02, 2.958109130859375e+02, 2.945577087402344e+02, 2.9775537109375e+02, 2.962743530273438e+02, 2.976807861328125e+02, 2.959515380859375e+02, 2.961866760253906e+02, 2.959931640625e+02, 2.982442626953125e+02, 2.946266174316406e+02, 2.971179504394531e+02, 2.968929138183594e+02, 2.970372924804688e+02, 2.9661181640625e+02, 2.975764465332031e+02, 2.973679504394531e+02, 2.976821899414062e+02, 2.978348999023438e+02, 2.964918212890625e+02, 2.977147827148438e+02, 2.974137878417969e+02, 2.955561218261719e+02, 2.972049560546875e+02, 2.963542175292969e+02, 2.960565185546875e+02, 2.977266235351562e+02, 2.961923828125e+02, 2.963898620605469e+02, 2.963341674804688e+02, 2.960115356445312e+02, 2.962161865234375e+02, 2.954604187011719e+02, 2.956786193847656e+02, 2.941723022460938e+02, 2.948476867675781e+02, 2.943451843261719e+02, 2.944716186523438e+02, 2.941226196289062e+02, 2.919582214355469e+02, 2.929217529296875e+02, 2.92173583984375e+02, 2.912181091308594e+02, 2.920714111328125e+02, 2.912368469238281e+02, 2.915953979492188e+02, 2.936615905761719e+02, 2.921942138671875e+02, 2.920031433105469e+02, 2.921245422363281e+02, 2.912767333984375e+02, 2.913471069335938e+02, 2.905751342773438e+02, 2.898685302734375e+02, 2.91618408203125e+02, 2.914317932128906e+02, 2.905054626464844e+02, 2.91697509765625e+02, 2.907715454101562e+02, 2.908905029296875e+02, 2.908026123046875e+02, 2.910172729492188e+02, 2.907653503417969e+02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Adaptors_Examples_ThermalZoneHVACNoExhaust.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Adaptors_Examples_ThermalZoneHVACNoExhaust.txt
new file mode 100644
index 00000000..6f75f5b6
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Adaptors_Examples_ThermalZoneHVACNoExhaust.txt
@@ -0,0 +1,14 @@
+last-generated=2017-03-31
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "4",
+ "linear": "0"
+}
+TSet.y=[2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
+vol.T=[2.931499938964844e+02, 2.906447143554688e+02, 2.890402526855469e+02, 2.891534118652344e+02, 2.891515808105469e+02, 2.891515502929688e+02, 2.891518249511719e+02, 2.891520690917969e+02, 2.891522827148438e+02, 2.891524353027344e+02, 2.891525573730469e+02, 2.891526489257812e+02, 2.891527099609375e+02, 2.891766357421875e+02, 2.893485412597656e+02, 2.916920166015625e+02, 2.931203918457031e+02, 2.931500244140625e+02, 2.9315234375e+02, 2.931518859863281e+02, 2.931524658203125e+02, 2.9321533203125e+02, 2.933444519042969e+02, 2.935014038085938e+02, 2.936575317382812e+02, 2.937914733886719e+02, 2.93887451171875e+02, 2.939341735839844e+02, 2.939237670898438e+02, 2.93851318359375e+02, 2.937142639160156e+02, 2.935120849609375e+02, 2.9324609375e+02, 2.93151123046875e+02, 2.931472473144531e+02, 2.931474304199219e+02, 2.931473388671875e+02, 2.931473083496094e+02, 2.931472778320312e+02, 2.931473388671875e+02, 2.92457275390625e+02, 2.910179443359375e+02, 2.898218383789062e+02, 2.891372375488281e+02, 2.891507263183594e+02, 2.891483154296875e+02, 2.891486511230469e+02, 2.891489868164062e+02, 2.891492919921875e+02, 2.891496276855469e+02, 2.891499633789062e+02, 2.891503295898438e+02, 2.891506652832031e+02, 2.891509704589844e+02, 2.891512756347656e+02, 2.891515808105469e+02, 2.891518249511719e+02, 2.891520690917969e+02, 2.891522827148438e+02, 2.891524353027344e+02, 2.891525573730469e+02, 2.891526489257812e+02, 2.891527099609375e+02, 2.891766357421875e+02, 2.893485412597656e+02, 2.916920166015625e+02, 2.931203918457031e+02, 2.931500244140625e+02, 2.9315234375e+02, 2.931518859863281e+02, 2.931524658203125e+02, 2.9321533203125e+02, 2.933444519042969e+02, 2.935014038085938e+02, 2.936575317382812e+02, 2.937914733886719e+02, 2.93887451171875e+02, 2.939341735839844e+02, 2.939237670898438e+02, 2.93851318359375e+02, 2.937142333984375e+02, 2.935120849609375e+02, 2.9324609375e+02, 2.93151123046875e+02, 2.931472473144531e+02, 2.931474304199219e+02, 2.931473388671875e+02, 2.931473083496094e+02, 2.931472778320312e+02, 2.931473388671875e+02, 2.92457275390625e+02, 2.910179443359375e+02, 2.898218383789062e+02, 2.891372375488281e+02, 2.891507263183594e+02, 2.891483154296875e+02, 2.891486511230469e+02, 2.891489868164062e+02, 2.891492919921875e+02, 2.891496276855469e+02, 2.891499633789062e+02]
+time=[0e+00, 1.728e+05]
+conPI.y=[0e+00, 0e+00, 3.496760129928589e-01, 2.979263067245483e-01, 2.719705402851105e-01, 2.516441941261292e-01, 2.267798185348511e-01, 1.983284205198288e-01, 1.667501926422119e-01, 1.325428783893585e-01, 9.624584019184113e-02, 5.842979252338409e-02, 1.969282701611519e-02, 0e+00, 0e+00, 1e+00, 4.854721948504448e-02, 8.806502819061267e-02, 5.061797797679901e-02, 2.213104814291e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.386947423219681e-02, 1.161494925618173e-01, 1.524828821420668e-01, 1.902670115232468e-01, 2.290053069591522e-01, 2.680526673793793e-01, 3.067950904369354e-01, 0e+00, 0e+00, 0e+00, 2.680160999298096e-01, 2.247810065746307e-01, 2.512702941894531e-01, 2.724068164825439e-01, 2.890387177467346e-01, 3.011248409748077e-01, 3.084627985954285e-01, 3.109357059001923e-01, 3.085053563117981e-01, 3.012092411518097e-01, 2.891630530357361e-01, 2.725565731525421e-01, 2.51651734113693e-01, 2.267782390117643e-01, 1.983282268047335e-01, 1.667506247758865e-01, 1.325431317090988e-01, 9.62454155087471e-02, 5.842986702919006e-02, 1.969274505972862e-02, 0e+00, 0e+00, 1e+00, 4.854684323072433e-02, 8.806503564119339e-02, 5.061796307563756e-02, 2.213107608258747e-02, 8.088148206741863e-17, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.386953383684158e-02, 1.161487698554993e-01, 1.524830758571625e-01, 1.902673840522766e-01, 2.290045917034149e-01, 2.680526673793793e-01, 3.067949712276459e-01, 0e+00, 0e+00, 0e+00, 2.680160999298096e-01, 2.247810065746307e-01, 2.512702941894531e-01, 2.724068164825439e-01, 2.890387177467346e-01, 3.011248409748077e-01, 3.084627985954285e-01, 3.109357357025146e-01]
+hea.Q_flow=[0e+00, 0e+00, 3.776500854492188e+02, 3.217604064941406e+02, 2.937281799316406e+02, 2.717757568359375e+02, 2.449221954345703e+02, 2.141947021484375e+02, 1.800902099609375e+02, 1.431463165283203e+02, 1.039455108642578e+02, 6.310417556762695e+01, 2.126825332641602e+01, 0e+00, 0e+00, 1.08e+03, 5.243099975585938e+01, 9.511022949218737e+01, 5.466741943359375e+01, 2.390153121948242e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.977903747558594e+01, 1.254414520263674e+02, 1.646815185546873e+02, 2.054883728027344e+02, 2.473257293701172e+02, 2.894968872070312e+02, 3.313387145996094e+02, 0e+00, 0e+00, 0e+00, 2.894573669433594e+02, 2.427634887695312e+02, 2.713719177246094e+02, 2.941993713378906e+02, 3.121618347167969e+02, 3.252148132324219e+02, 3.331398315429688e+02, 3.35810546875e+02, 3.33185791015625e+02, 3.253059692382812e+02, 3.122960815429688e+02, 2.943611145019531e+02, 2.717838745117185e+02, 2.449205017089841e+02, 2.141944732666018e+02, 1.800906677246094e+02, 1.431465759277344e+02, 1.039450454711914e+02, 6.310425567626953e+01, 2.126816558837891e+01, 0e+00, 0e+00, 1.08e+03, 5.243059158325195e+01, 9.511024475097656e+01, 5.466740036010714e+01, 2.390156173706079e+01, 8.748557434046234e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.977909851074219e+01, 1.25440673828125e+02, 1.646817169189453e+02, 2.0548876953125e+02, 2.47324951171875e+02, 2.894968872070312e+02, 3.313385620117188e+02, 0e+00, 0e+00, 0e+00, 2.894573669433594e+02, 2.427634887695312e+02, 2.713719177246094e+02, 2.941993713378906e+02, 3.121618347167969e+02, 3.252148132324219e+02, 3.331398315429688e+02, 3.358105773925781e+02]
+hex.Q1_flow=[4.733437805175781e+02, 3.395085754394531e+02, 2.489355773925781e+02, 2.446812896728516e+02, 2.305248107910156e+02, 2.128278656005859e+02, 1.917927398681641e+02, 1.677317352294922e+02, 1.410254974365234e+02, 1.120952224731445e+02, 8.139711761474609e+01, 4.941536331176758e+01, 1.665427780151367e+01, -1.511164379119873e+01, -3.883401489257817e+01, 5.243211364746094e+01, 9.685153198242188e+01, 6.947137451171869e+01, 4.287501907348633e+01, 1.877761840820312e+01, -2.241515398025513e+00, -1.662947082519531e+01, -2.390015411376953e+01, -2.58500862121582e+01, -2.3826904296875e+01, -1.885657119750977e+01, -1.17343864440918e+01, -3.089706182479858e+00, 6.568295478820843e+00, 1.681833076477051e+01, 2.730479621887207e+01, 3.772246170043945e+01, 4.780615234375e+01, 6.9527587890625e+01, 9.826333618164075e+01, 1.289779510498045e+02, 1.609596862792969e+02, 1.937207183837891e+02, 2.267444610595703e+02, 2.595100402832031e+02, 2.552043914794922e+02, 2.102085418701172e+02, 1.762405242919922e+02, 1.669512023925781e+02, 1.917340240478516e+02, 2.126571807861328e+02, 2.303710632324219e+02, 2.444484710693359e+02, 2.546703796386719e+02, 2.608759765625e+02, 2.629674377441406e+02, 2.609117736816406e+02, 2.547413330078125e+02, 2.445534820556641e+02, 2.305088806152344e+02, 2.128290100097655e+02, 1.917926940917967e+02, 1.677317047119143e+02, 1.410254821777344e+02, 1.120952072143555e+02, 8.139711761474609e+01, 4.941535568237305e+01, 1.665427780151367e+01, -1.511167621612549e+01, -3.883418273925781e+01, 5.243201065063477e+01, 9.685153961181641e+01, 6.947137451171875e+01, 4.287501907348611e+01, 1.877761840820332e+01, -2.241505622863605e+00, -1.662946319580078e+01, -2.390017890930176e+01, -2.585012435913086e+01, -2.382691955566406e+01, -1.885658264160156e+01, -1.173439979553223e+01, -3.089716911315918e+00, 6.568244934082031e+00, 1.681825637817383e+01, 2.730471801757812e+01, 3.772238540649414e+01, 4.780608749389648e+01, 6.952758026123047e+01, 9.826335144042969e+01, 1.289779663085938e+02, 1.609597015380859e+02, 1.937207489013672e+02, 2.267444458007812e+02, 2.595100402832031e+02, 2.552043914794922e+02, 2.102085266113281e+02, 1.762405242919922e+02, 1.669512023925781e+02, 1.917340240478516e+02, 2.126571807861328e+02, 2.303710632324219e+02, 2.444484710693359e+02, 2.546703796386719e+02, 2.608759765625e+02, 2.629674377441406e+02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Adaptors_Examples_ThermalZoneHVACWithExhaust.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Adaptors_Examples_ThermalZoneHVACWithExhaust.txt
new file mode 100644
index 00000000..c0a2fce0
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Adaptors_Examples_ThermalZoneHVACWithExhaust.txt
@@ -0,0 +1,14 @@
+last-generated=2017-05-02
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "4",
+ "linear": "0"
+}
+TSet.y=[2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
+vol.T=[2.931499938964844e+02, 2.9048095703125e+02, 2.891119384765625e+02, 2.891559753417969e+02, 2.891513061523438e+02, 2.891516723632812e+02, 2.891519775390625e+02, 2.891522521972656e+02, 2.891524658203125e+02, 2.891526489257812e+02, 2.891527709960938e+02, 2.891528625488281e+02, 2.891529235839844e+02, 2.891785583496094e+02, 2.893615112304688e+02, 2.917102355957031e+02, 2.931064147949219e+02, 2.931513671875e+02, 2.931524963378906e+02, 2.931520080566406e+02, 2.931526489257812e+02, 2.932197875976562e+02, 2.93356201171875e+02, 2.935200500488281e+02, 2.93680908203125e+02, 2.938166809082031e+02, 2.939114379882812e+02, 2.939540100097656e+02, 2.939369201660156e+02, 2.938556518554688e+02, 2.937081298828125e+02, 2.934942932128906e+02, 2.932159118652344e+02, 2.931468505859375e+02, 2.931471557617188e+02, 2.931472473144531e+02, 2.931471252441406e+02, 2.931470947265625e+02, 2.931470642089844e+02, 2.931471252441406e+02, 2.924068908691406e+02, 2.908880310058594e+02, 2.896519775390625e+02, 2.891730651855469e+02, 2.891479187011719e+02, 2.891481628417969e+02, 2.891485595703125e+02, 2.891488952636719e+02, 2.891492309570312e+02, 2.891495971679688e+02, 2.891499633789062e+02, 2.891503295898438e+02, 2.891506958007812e+02, 2.891510620117188e+02, 2.891513977050781e+02, 2.891517028808594e+02, 2.891519775390625e+02, 2.891522216796875e+02, 2.891524658203125e+02, 2.891526489257812e+02, 2.891527709960938e+02, 2.891528625488281e+02, 2.891529235839844e+02, 2.891785583496094e+02, 2.893615417480469e+02, 2.917102355957031e+02, 2.931064147949219e+02, 2.931513671875e+02, 2.931524963378906e+02, 2.931520080566406e+02, 2.931526489257812e+02, 2.932197875976562e+02, 2.93356201171875e+02, 2.935200500488281e+02, 2.93680908203125e+02, 2.938166809082031e+02, 2.939114379882812e+02, 2.939540100097656e+02, 2.939369201660156e+02, 2.938556518554688e+02, 2.937081298828125e+02, 2.934942932128906e+02, 2.932159118652344e+02, 2.931468505859375e+02, 2.931471557617188e+02, 2.931472473144531e+02, 2.931471252441406e+02, 2.931470947265625e+02, 2.931470642089844e+02, 2.931471252441406e+02, 2.924068908691406e+02, 2.908880310058594e+02, 2.896519775390625e+02, 2.891730651855469e+02, 2.891479187011719e+02, 2.891481628417969e+02, 2.891485595703125e+02, 2.891488952636719e+02, 2.891492309570312e+02, 2.891495971679688e+02, 2.891499633789062e+02]
+time=[0e+00, 1.728e+05]
+conPI.y=[0e+00, 0e+00, 4.561614394187927e-01, 3.103755414485931e-01, 2.934946119785309e-01, 2.713925838470459e-01, 2.445510923862457e-01, 2.13872566819191e-01, 1.798232346773148e-01, 1.429375112056732e-01, 1.037974804639816e-01, 6.302016973495483e-02, 2.124924771487713e-02, 0e+00, 0e+00, 1e+00, 8.686327934265137e-02, 9.463745355606065e-02, 5.448174104094505e-02, 2.388010174036026e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.245795220136642e-02, 1.2553708255291e-01, 1.643884032964705e-01, 2.051554173231125e-01, 2.469280213117599e-01, 2.890339195728302e-01, 3.308109045028687e-01, 0e+00, 0e+00, 0e+00, 2.160038650035858e-01, 2.417584955692291e-01, 2.712417244911194e-01, 2.937251329421997e-01, 3.11670333147049e-01, 3.247061371803284e-01, 3.326211273670197e-01, 3.352895677089691e-01, 3.326703310012817e-01, 3.248046934604645e-01, 3.118166625499725e-01, 2.939111888408661e-01, 2.713705897331236e-01, 2.445501387119291e-01, 2.138731330633166e-01, 1.798232942819595e-01, 1.429373472929001e-01, 1.037973165512085e-01, 6.302036345005035e-02, 2.124935574829578e-02, 0e+00, 0e+00, 1e+00, 8.686539530754089e-02, 9.463740140199661e-02, 5.448256060481044e-02, 2.388007566332842e-02, 8.760353553682876e-17, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.245831727981567e-02, 1.255370676517487e-01, 1.643884181976318e-01, 2.051559388637543e-01, 2.469281256198883e-01, 2.890337407588959e-01, 3.308107554912567e-01, 0e+00, 0e+00, 0e+00, 2.16003879904747e-01, 2.417584955692291e-01, 2.712417244911194e-01, 2.937251329421997e-01, 3.11670333147049e-01, 3.247061371803284e-01, 3.326211273670197e-01, 3.352895379066467e-01]
+hea.Q_flow=[0e+00, 0e+00, 4.926543579101562e+02, 3.3520556640625e+02, 3.169741821289062e+02, 2.9310400390625e+02, 2.641151733398438e+02, 2.309823760986328e+02, 1.942090911865234e+02, 1.543725128173828e+02, 1.121012802124023e+02, 6.806178283691406e+01, 2.294918632507324e+01, 0e+00, 0e+00, 1.08e+03, 9.381233978271484e+01, 1.022084503173827e+02, 5.884027862548828e+01, 2.57905101776123e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.905458831787109e+01, 1.35580047607422e+02, 1.775394744873045e+02, 2.215678405761719e+02, 2.666822509765625e+02, 3.121566162109375e+02, 3.572757873535156e+02, 0e+00, 0e+00, 0e+00, 2.332841796875e+02, 2.610991821289062e+02, 2.929410705566406e+02, 3.172231140136719e+02, 3.366039733886719e+02, 3.506826171875e+02, 3.592308349609375e+02, 3.621127319335938e+02, 3.592839660644531e+02, 3.507890930175781e+02, 3.367619934082031e+02, 3.174241027832031e+02, 2.930802307128904e+02, 2.641141662597653e+02, 2.309829864501956e+02, 1.942091674804688e+02, 1.543723297119141e+02, 1.121010971069336e+02, 6.806199645996094e+01, 2.294930458068848e+01, 0e+00, 0e+00, 1.08e+03, 9.381462860107422e+01, 1.022083969116211e+02, 5.884116363525361e+01, 2.579048347473171e+01, 9.459100169806334e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.905498504638672e+01, 1.355800323486328e+02, 1.775394897460938e+02, 2.215684204101562e+02, 2.66682373046875e+02, 3.121564331054688e+02, 3.572756042480469e+02, 0e+00, 0e+00, 0e+00, 2.332841949462891e+02, 2.610991821289062e+02, 2.929410705566406e+02, 3.172231140136719e+02, 3.366039733886719e+02, 3.506826171875e+02, 3.592308349609375e+02, 3.621127014160156e+02]
+hex.Q1_flow=[4.260093994140625e+02, 2.978057556152344e+02, 2.274346313476562e+02, 2.203353118896484e+02, 2.074590301513672e+02, 1.9155126953125e+02, 1.726203002929688e+02, 1.509662475585937e+02, 1.269313888549805e+02, 1.008947525024414e+02, 7.326693725585938e+01, 4.448367691040039e+01, 1.499888896942139e+01, -1.350836753845215e+01, -3.433544540405277e+01, 4.80511589050293e+01, 8.650458526611328e+01, 6.258703994750972e+01, 3.85951042175293e+01, 1.690662956237793e+01, -2.00849437713623e+00, -1.475566482543945e+01, -2.09544734954834e+01, -2.238302612304688e+01, -2.03375129699707e+01, -1.577725601196289e+01, -9.425944328308105e+00, -1.841824650764465e+00, 6.53347015380863e+00, 1.534148216247559e+01, 2.428417015075684e+01, 3.310863494873047e+01, 4.159706878662109e+01, 6.237343215942383e+01, 8.843294525146496e+01, 1.160711135864257e+02, 1.448538055419922e+02, 1.74338623046875e+02, 2.040599670410156e+02, 2.335491333007812e+02, 2.27298583984375e+02, 1.830390472412109e+02, 1.505762023925781e+02, 1.519516296386719e+02, 1.724278717041016e+02, 1.913848876953125e+02, 2.073294525146484e+02, 2.199998016357422e+02, 2.292007293701172e+02, 2.347870178222656e+02, 2.366705932617188e+02, 2.348217468261719e+02, 2.292696075439453e+02, 2.201017456054688e+02, 2.074627380371094e+02, 1.915519409179686e+02, 1.726202392578123e+02, 1.509662170410158e+02, 1.269313735961914e+02, 1.008947448730469e+02, 7.326694488525391e+01, 4.448368072509766e+01, 1.499888515472412e+01, -1.350832843780518e+01, -3.433513641357422e+01, 4.80513801574707e+01, 8.650449371337891e+01, 6.258699417114258e+01, 3.859509277343731e+01, 1.690661239624041e+01, -2.008539676666112e+00, -1.475570678710938e+01, -2.095443344116211e+01, -2.238293838500977e+01, -2.033745384216309e+01, -1.577727317810059e+01, -9.425952911376953e+00, -1.841829419136047e+00, 6.533467769622803e+00, 1.534148216247559e+01, 2.428417015075684e+01, 3.310863494873047e+01, 4.159707260131836e+01, 6.23734130859375e+01, 8.843294525146484e+01, 1.160711059570312e+02, 1.448538208007812e+02, 1.74338623046875e+02, 2.040599670410156e+02, 2.335491180419922e+02, 2.27298583984375e+02, 1.830390472412109e+02, 1.505762023925781e+02, 1.519516296386719e+02, 1.724278717041016e+02, 1.913848876953125e+02, 2.073294525146484e+02, 2.199998016357422e+02, 2.292007293701172e+02, 2.347870178222656e+02, 2.366705932617188e+02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Conversion_Validation_AirToOutlet.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Conversion_Validation_AirToOutlet.txt
new file mode 100644
index 00000000..ba4948ba
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Conversion_Validation_AirToOutlet.txt
@@ -0,0 +1,12 @@
+last-generated=2016-04-20
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+conAirWithC.outlet.forward.X_w=[0.00999999977648258209, 0.00999999977648258209]
+conAirNoC.outlet.forward.X_w=[0.00999999977648258209, 0.00999999977648258209]
+time=[0., 1.]
+conDryAirWithC.outlet.forward.C[1]=[0.00000999999974737875, 0.00000999999974737875]
+conAirWithC.outlet.forward.C[1]=[0.00000999999974737875, 0.00000999999974737875]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Conversion_Validation_AirToOutletFlowReversal.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Conversion_Validation_AirToOutletFlowReversal.txt
new file mode 100644
index 00000000..7703ed1d
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Conversion_Validation_AirToOutletFlowReversal.txt
@@ -0,0 +1,16 @@
+last-generated=2016-06-28
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+conAirWithC.outlet.forward.X_w=[0.00999999977648258209, 0.00999999977648258209]
+conAirNoC.outlet.forward.X_w=[0.00999999977648258209, 0.00999999977648258209]
+time=[0., 1.]
+conDryAirWithC.outlet.forward.C[1]=[0.00000999999974737875, 0.00000999999974737875]
+conAirWithC.outlet.forward.C[1]=[0.00000999999974737875, 0.00000999999974737875]
+conAirWithC.X_wZon=[0.01499999966472387314, 0.01499999966472387314]
+conAirNoC.X_wZon=[0.01499999966472387314, 0.01499999966472387314]
+conAirWithC.CZon[1]=[0.69999998807907104492, 0.69999998807907104492]
+conDryAirWithC.CZon[1]=[0.69999998807907104492, 0.69999998807907104492]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Conversion_Validation_InletToAirDryAir.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Conversion_Validation_InletToAirDryAir.txt
new file mode 100644
index 00000000..04830589
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Conversion_Validation_InletToAirDryAir.txt
@@ -0,0 +1,11 @@
+last-generated=2016-06-28
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+conAir.m_flow=[0.20000000298023223877, 0.20000000298023223877]
+time=[0., 1.]
+conAir.T=[295.1300048828125, 295.1300048828125]
+souRev.outlet.backward.T=[283.149993896484375, 283.149993896484375]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Conversion_Validation_InletToAirDryAirCO2.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Conversion_Validation_InletToAirDryAirCO2.txt
new file mode 100644
index 00000000..e5ce57e1
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Conversion_Validation_InletToAirDryAirCO2.txt
@@ -0,0 +1,13 @@
+last-generated=2016-06-28
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+conAir.m_flow=[0.20000000298023223877, 0.20000000298023223877]
+time=[0., 1.]
+conAir.T=[295.1300048828125, 295.1300048828125]
+conAir.C[1]=[0.00999999977648258209, 0.00999999977648258209]
+souRev.outlet.backward.T=[283.149993896484375, 283.149993896484375]
+souRev.outlet.backward.C[1]=[0.80000001192092895508, 0.80000001192092895508]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Conversion_Validation_InletToAirMoistAir.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Conversion_Validation_InletToAirMoistAir.txt
new file mode 100644
index 00000000..170216bb
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Conversion_Validation_InletToAirMoistAir.txt
@@ -0,0 +1,13 @@
+last-generated=2016-06-28
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+conAir.m_flow=[0.20000000298023223877, 0.20000000298023223877]
+time=[0., 1.]
+conAir.T=[295.1300048828125, 295.1300048828125]
+conAir.X_w=[0.00999999977648258209, 0.00999999977648258209]
+souRev.outlet.backward.T=[283.149993896484375, 283.149993896484375]
+souRev.outlet.backward.X_w=[0.01200000010430812836, 0.01200000010430812836]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Conversion_Validation_InletToAirMoistAirCO2.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Conversion_Validation_InletToAirMoistAirCO2.txt
new file mode 100644
index 00000000..8b83d908
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Conversion_Validation_InletToAirMoistAirCO2.txt
@@ -0,0 +1,15 @@
+last-generated=2016-06-28
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+conAir.m_flow=[0.20000000298023223877, 0.20000000298023223877]
+time=[0., 1.]
+conAir.T=[295.1300048828125, 295.1300048828125]
+conAir.X_w=[0.00999999977648258209, 0.00999999977648258209]
+conAir.C[1]=[0.00999999977648258209, 0.00999999977648258209]
+souRev.outlet.backward.T=[283.149993896484375, 283.149993896484375]
+souRev.outlet.backward.X_w=[0.01200000010430812836, 0.01200000010430812836]
+souRev.outlet.backward.C[1]=[0.80000001192092895508, 0.80000001192092895508]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_Fan.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_Fan.txt
new file mode 100644
index 00000000..fb091c0b
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_Fan.txt
@@ -0,0 +1,73 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "outlet.m_flow": [
+ "inlet.m_flow"
+ ],
+ "inlet.backward.T": [
+ "inlet.m_flow",
+ "inlet.p",
+ "outlet.backward.T",
+ "outlet.backward.X_w",
+ "dp_in"
+ ],
+ "inlet.backward.X_w": [
+ "outlet.backward.X_w"
+ ],
+ "outlet.forward.T": [
+ "inlet.m_flow",
+ "inlet.p",
+ "inlet.forward.T",
+ "inlet.forward.X_w",
+ "dp_in"
+ ],
+ "outlet.forward.X_w": [
+ "inlet.forward.X_w"
+ ],
+ "outlet.p": [
+ "inlet.p",
+ "dp_in"
+ ]
+ },
+ "InitialUnknowns": {
+ "outlet.m_flow": [
+ "inlet.m_flow"
+ ],
+ "inlet.backward.T": [
+ "inlet.m_flow",
+ "inlet.p",
+ "outlet.backward.T",
+ "outlet.backward.X_w",
+ "com.per.hydraulicEfficiency.V_flow[1]",
+ "com.per.hydraulicEfficiency.eta[1]",
+ "com.per.motorEfficiency.V_flow[1]",
+ "com.per.motorEfficiency.eta[1]",
+ "com.per.motorCooledByFluid",
+ "dp_in"
+ ],
+ "inlet.backward.X_w": [
+ "outlet.backward.X_w"
+ ],
+ "outlet.forward.T": [
+ "inlet.m_flow",
+ "inlet.p",
+ "inlet.forward.T",
+ "inlet.forward.X_w",
+ "com.per.hydraulicEfficiency.V_flow[1]",
+ "com.per.hydraulicEfficiency.eta[1]",
+ "com.per.motorEfficiency.V_flow[1]",
+ "com.per.motorEfficiency.eta[1]",
+ "com.per.motorCooledByFluid",
+ "dp_in"
+ ],
+ "outlet.forward.X_w": [
+ "inlet.forward.X_w"
+ ],
+ "outlet.p": [
+ "inlet.p",
+ "dp_in"
+ ]
+ },
+ "Derivatives": {}
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_FlowSplitter_u.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_FlowSplitter_u.txt
new file mode 100644
index 00000000..dd1cda93
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_FlowSplitter_u.txt
@@ -0,0 +1,63 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "outlet[1].m_flow": [
+ "u[1]"
+ ],
+ "outlet[1].p": [
+ "inlet.p"
+ ],
+ "outlet[2].forward.T": [
+ "inlet.forward.T"
+ ],
+ "inlet.backward.T": [],
+ "outlet[1].forward.T": [
+ "inlet.forward.T"
+ ],
+ "outlet[2].m_flow": [
+ "u[2]"
+ ],
+ "inlet.backward.X_w": [],
+ "outlet[1].forward.X_w": [
+ "inlet.forward.X_w"
+ ],
+ "outlet[2].p": [
+ "inlet.p"
+ ],
+ "outlet[2].forward.X_w": [
+ "inlet.forward.X_w"
+ ]
+ },
+ "InitialUnknowns": {
+ "outlet[1].m_flow": [
+ "m_flow_nominal[1]",
+ "u[1]"
+ ],
+ "outlet[1].p": [
+ "inlet.p"
+ ],
+ "outlet[2].forward.T": [
+ "inlet.forward.T"
+ ],
+ "inlet.backward.T": [],
+ "outlet[1].forward.T": [
+ "inlet.forward.T"
+ ],
+ "outlet[2].m_flow": [
+ "m_flow_nominal[2]",
+ "u[2]"
+ ],
+ "inlet.backward.X_w": [],
+ "outlet[1].forward.X_w": [
+ "inlet.forward.X_w"
+ ],
+ "outlet[2].p": [
+ "inlet.p"
+ ],
+ "outlet[2].forward.X_w": [
+ "inlet.forward.X_w"
+ ]
+ },
+ "Derivatives": {}
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZone.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZone.txt
new file mode 100644
index 00000000..a910ae57
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZone.txt
@@ -0,0 +1,173 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "weaBus.TDryBul": [],
+ "weaBus.HHorIR": [],
+ "fluPor[1].m_flow": [
+ "fan.filter.x[2]"
+ ],
+ "weaBus.nOpa": [],
+ "weaBus.solDec": [],
+ "fluPor[1].forward.T": [
+ "fan.filter.x[2]",
+ "fluPor[1].backward.T",
+ "fluPor[1].backward.X_w"
+ ],
+ "weaBus.nTot": [],
+ "weaBus.solHouAng": [],
+ "weaBus.TBlaSky": [],
+ "weaBus.TDewPoi": [],
+ "TOut": [],
+ "QGaiLat_flow": [],
+ "fluPor[1].forward.X_w": [
+ "fan.filter.x[2]"
+ ],
+ "weaBus.solTim": [],
+ "weaBus.winDir": [],
+ "weaBus.relHum": [],
+ "weaBus.celHei": [],
+ "fluPor[2].forward.X_w": [],
+ "QGaiSenCon_flow": [],
+ "weaBus.lon": [],
+ "weaBus.HGloHor": [],
+ "QGaiRad_flow": [],
+ "weaBus.solAlt": [],
+ "weaBus.solZen": [],
+ "weaBus.lat": [],
+ "fluPor[2].m_flow": [
+ "fan.filter.x[2]"
+ ],
+ "weaBus.winSpe": [],
+ "fluPor[2].forward.T": [],
+ "weaBus.cloTim": [],
+ "weaBus.HDirNor": [],
+ "weaBus.HDifHor": [],
+ "weaBus.pAtm": []
+ },
+ "InitialUnknowns": {
+ "der(senTemHXOut.T)": [
+ "fan.m_flow_start",
+ "senTemHXOut.T_start",
+ "weaDat.pAtm",
+ "fluPor[1].backward.T",
+ "fluPor[1].backward.X_w"
+ ],
+ "weaBus.HGloHor": [],
+ "weaBus.TDryBul": [
+ "weaDat.pAtm"
+ ],
+ "der(senTemSupAir.T)": [
+ "fan.m_flow_start",
+ "cooCoi.eps",
+ "senTemSupAir.T_start",
+ "con.bandwidth",
+ "con.pre_y_start",
+ "mWat_flow.realTrue",
+ "weaDat.pAtm",
+ "fluPor[1].backward.T",
+ "fluPor[1].backward.X_w"
+ ],
+ "weaBus.HHorIR": [],
+ "fluPor[1].m_flow": [
+ "fan.m_flow_start"
+ ],
+ "weaBus.nOpa": [],
+ "weaBus.solDec": [],
+ "fluPor[1].forward.T": [
+ "fan.per.hydraulicEfficiency.V_flow[1]",
+ "fan.per.hydraulicEfficiency.eta[1]",
+ "fan.per.motorEfficiency.V_flow[1]",
+ "fan.per.motorEfficiency.eta[1]",
+ "fan.per.motorCooledByFluid",
+ "fan.m_flow_start",
+ "cooCoi.eps",
+ "con.bandwidth",
+ "con.pre_y_start",
+ "mWat_flow.realTrue",
+ "weaDat.pAtm",
+ "fluPor[1].backward.T",
+ "fluPor[1].backward.X_w"
+ ],
+ "weaBus.nTot": [],
+ "weaBus.solHouAng": [],
+ "weaBus.TBlaSky": [
+ "weaDat.pAtm"
+ ],
+ "fan.filter.x[2]": [
+ "fan.m_flow_start"
+ ],
+ "weaBus.TDewPoi": [],
+ "weaBus.winDir": [],
+ "TOut": [
+ "weaDat.pAtm"
+ ],
+ "QGaiLat_flow": [
+ "zero.k"
+ ],
+ "der(fan.filter.x[1])": [],
+ "fluPor[1].forward.X_w": [
+ "fan.m_flow_start",
+ "weaDat.pAtm"
+ ],
+ "weaBus.solTim": [],
+ "senTemHXOut.T": [
+ "senTemHXOut.T_start"
+ ],
+ "weaBus.relHum": [],
+ "weaBus.celHei": [],
+ "fluPor[2].forward.X_w": [],
+ "QGaiSenCon_flow": [
+ "zero.k"
+ ],
+ "der(fan.filter.x[2])": [
+ "fan.riseTime",
+ "fan.m_flow_start"
+ ],
+ "weaBus.lon": [],
+ "senTemSupAir.T": [
+ "senTemSupAir.T_start"
+ ],
+ "QGaiRad_flow": [
+ "zero.k"
+ ],
+ "weaBus.solAlt": [],
+ "weaBus.solZen": [],
+ "weaBus.lat": [],
+ "fluPor[2].m_flow": [
+ "fan.m_flow_start"
+ ],
+ "weaBus.winSpe": [],
+ "fluPor[2].forward.T": [],
+ "weaBus.cloTim": [],
+ "weaBus.HDirNor": [],
+ "weaBus.HDifHor": [],
+ "fan.filter.x[1]": [
+ "fan.riseTime"
+ ],
+ "weaBus.pAtm": [
+ "weaDat.pAtm"
+ ]
+ },
+ "Derivatives": {
+ "der(senTemSupAir.T)": [
+ "fan.filter.x[2]",
+ "senTemSupAir.T",
+ "fluPor[1].backward.T",
+ "fluPor[1].backward.X_w"
+ ],
+ "der(senTemHXOut.T)": [
+ "fan.filter.x[2]",
+ "senTemHXOut.T",
+ "fluPor[1].backward.T",
+ "fluPor[1].backward.X_w"
+ ],
+ "der(fan.filter.x[2])": [
+ "fan.filter.x[1]",
+ "fan.filter.x[2]"
+ ],
+ "der(fan.filter.x[1])": [
+ "fan.filter.x[1]"
+ ]
+ }
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZones.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZones.txt
new file mode 100644
index 00000000..79692d16
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZones.txt
@@ -0,0 +1,374 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "fluPor[2, 1].forward.T": [
+ "fluPor[1, 1].backward.T",
+ "fluPor[1, 1].backward.X_w",
+ "fluPor[2, 1].backward.T",
+ "fluPor[2, 1].backward.X_w",
+ "fan.filter.x[2]",
+ "fan2.filter.x[2]"
+ ],
+ "fluPor[2, 2].m_flow": [
+ "fan.filter.x[2]",
+ "fan2.filter.x[2]"
+ ],
+ "QGaiRad_flow[1]": [],
+ "weaBus.TDryBul": [],
+ "fluPor[2, 1].forward.X_w": [
+ "fluPor[1, 1].backward.X_w",
+ "fan.filter.x[2]"
+ ],
+ "fluPor[2, 2].forward.T": [
+ "fluPor[1, 1].backward.T",
+ "fluPor[1, 1].backward.X_w",
+ "fan.filter.x[2]",
+ "fan2.filter.x[2]"
+ ],
+ "weaBus.HHorIR": [],
+ "fluPor[1, 1].m_flow": [
+ "fan.filter.x[2]"
+ ],
+ "weaBus.HDirNor": [],
+ "fluPor[1, 2].forward.T": [
+ "fluPor[2, 1].backward.T",
+ "fluPor[2, 1].backward.X_w",
+ "fan.filter.x[2]",
+ "fan2.filter.x[2]"
+ ],
+ "weaBus.nOpa": [],
+ "weaBus.solDec": [],
+ "weaBus.nTot": [],
+ "QGaiLat_flow[2]": [],
+ "weaBus.solHouAng": [],
+ "weaBus.TBlaSky": [],
+ "fluPor[2, 3].forward.T": [
+ "fluPor[1, 1].backward.T",
+ "fluPor[1, 1].backward.X_w",
+ "fan.filter.x[2]",
+ "fan2.filter.x[2]"
+ ],
+ "fluPor[2, 3].m_flow": [
+ "fan.filter.x[2]",
+ "fan2.filter.x[2]"
+ ],
+ "weaBus.TDewPoi": [],
+ "weaBus.winDir": [],
+ "weaBus.lon": [],
+ "TOut": [],
+ "fluPor[1, 1].forward.T": [
+ "fluPor[1, 1].backward.T",
+ "fluPor[1, 1].backward.X_w",
+ "fluPor[2, 1].backward.T",
+ "fluPor[2, 1].backward.X_w",
+ "fan.filter.x[2]",
+ "fan2.filter.x[2]"
+ ],
+ "fluPor[1, 3].forward.T": [
+ "fluPor[2, 1].backward.T",
+ "fluPor[2, 1].backward.X_w",
+ "fan.filter.x[2]",
+ "fan2.filter.x[2]"
+ ],
+ "fluPor[1, 1].forward.X_w": [
+ "fluPor[2, 1].backward.X_w",
+ "fan.filter.x[2]"
+ ],
+ "fluPor[1, 2].forward.X_w": [
+ "fluPor[2, 1].backward.X_w",
+ "fan.filter.x[2]",
+ "fan2.filter.x[2]"
+ ],
+ "QGaiRad_flow[2]": [],
+ "fluPor[1, 3].m_flow": [
+ "fan.filter.x[2]",
+ "fan2.filter.x[2]"
+ ],
+ "fluPor[2, 1].m_flow": [
+ "fan.filter.x[2]"
+ ],
+ "weaBus.relHum": [],
+ "QGaiSenCon_flow[1]": [],
+ "weaBus.celHei": [],
+ "fluPor[1, 3].forward.X_w": [
+ "fluPor[2, 1].backward.X_w",
+ "fan.filter.x[2]",
+ "fan2.filter.x[2]"
+ ],
+ "fluPor[2, 3].forward.X_w": [
+ "fluPor[1, 1].backward.X_w",
+ "fan.filter.x[2]",
+ "fan2.filter.x[2]"
+ ],
+ "fluPor[2, 2].forward.X_w": [
+ "fluPor[1, 1].backward.X_w",
+ "fan.filter.x[2]",
+ "fan2.filter.x[2]"
+ ],
+ "weaBus.HGloHor": [],
+ "QGaiLat_flow[1]": [],
+ "fluPor[1, 2].m_flow": [
+ "fan.filter.x[2]",
+ "fan2.filter.x[2]"
+ ],
+ "weaBus.solTim": [],
+ "weaBus.solAlt": [],
+ "weaBus.solZen": [],
+ "weaBus.lat": [],
+ "weaBus.winSpe": [],
+ "weaBus.cloTim": [],
+ "QGaiSenCon_flow[2]": [],
+ "weaBus.HDifHor": [],
+ "weaBus.pAtm": []
+ },
+ "InitialUnknowns": {
+ "fan2.filter.x[1]": [
+ "fan2.riseTime"
+ ],
+ "fluPor[2, 1].forward.T": [
+ "fluPor[1, 1].backward.T",
+ "fluPor[1, 1].backward.X_w",
+ "fluPor[2, 1].backward.T",
+ "fluPor[2, 1].backward.X_w",
+ "fan.per.hydraulicEfficiency.V_flow[1]",
+ "fan.per.hydraulicEfficiency.eta[1]",
+ "fan.per.motorEfficiency.V_flow[1]",
+ "fan.per.motorEfficiency.eta[1]",
+ "fan.per.motorCooledByFluid",
+ "fan.m_flow_start",
+ "cooCoi.eps",
+ "con.bandwidth",
+ "con.pre_y_start",
+ "mWat_flow.realTrue",
+ "weaDat.pAtm",
+ "fan2.m_flow_start"
+ ],
+ "fluPor[2, 2].m_flow": [
+ "fan.m_flow_start",
+ "fan2.m_flow_start"
+ ],
+ "QGaiRad_flow[1]": [
+ "zer[1].k"
+ ],
+ "weaBus.TDryBul": [
+ "weaDat.pAtm"
+ ],
+ "fluPor[2, 1].forward.X_w": [
+ "fluPor[1, 1].backward.X_w",
+ "fan.m_flow_start",
+ "weaDat.pAtm"
+ ],
+ "fluPor[2, 2].forward.T": [
+ "fluPor[1, 1].backward.T",
+ "fluPor[1, 1].backward.X_w",
+ "fan.m_flow_start",
+ "fan2.m_flow_start"
+ ],
+ "der(senTemSupAir.T)": [
+ "fluPor[1, 1].backward.T",
+ "fluPor[1, 1].backward.X_w",
+ "fluPor[2, 1].backward.T",
+ "fluPor[2, 1].backward.X_w",
+ "fan.m_flow_start",
+ "cooCoi.eps",
+ "senTemSupAir.T_start",
+ "con.bandwidth",
+ "con.pre_y_start",
+ "mWat_flow.realTrue",
+ "weaDat.pAtm",
+ "fan2.m_flow_start"
+ ],
+ "weaBus.HHorIR": [],
+ "der(fan2.filter.x[2])": [
+ "fan2.riseTime",
+ "fan2.m_flow_start"
+ ],
+ "fluPor[1, 1].m_flow": [
+ "fan.m_flow_start"
+ ],
+ "senTemHXOut.T": [
+ "senTemHXOut.T_start"
+ ],
+ "weaBus.HDirNor": [],
+ "weaBus.solHouAng": [],
+ "fluPor[1, 2].forward.T": [
+ "fluPor[2, 1].backward.T",
+ "fluPor[2, 1].backward.X_w",
+ "fan.m_flow_start",
+ "fan2.m_flow_start"
+ ],
+ "weaBus.nOpa": [],
+ "weaBus.solDec": [],
+ "der(senTemHXOut.T)": [
+ "fluPor[1, 1].backward.T",
+ "fluPor[1, 1].backward.X_w",
+ "fluPor[2, 1].backward.T",
+ "fluPor[2, 1].backward.X_w",
+ "fan.m_flow_start",
+ "senTemHXOut.T_start",
+ "weaDat.pAtm",
+ "fan2.m_flow_start"
+ ],
+ "weaBus.nTot": [],
+ "QGaiLat_flow[2]": [
+ "zer[2].k"
+ ],
+ "fan.filter.x[2]": [
+ "fan.m_flow_start"
+ ],
+ "weaBus.TBlaSky": [
+ "weaDat.pAtm"
+ ],
+ "fluPor[2, 3].forward.T": [
+ "fluPor[1, 1].backward.T",
+ "fluPor[1, 1].backward.X_w",
+ "fan.m_flow_start",
+ "fan2.m_flow_start"
+ ],
+ "fluPor[2, 3].m_flow": [
+ "fan.m_flow_start",
+ "fan2.m_flow_start"
+ ],
+ "weaBus.TDewPoi": [],
+ "weaBus.winDir": [],
+ "weaBus.lon": [],
+ "TOut": [
+ "weaDat.pAtm"
+ ],
+ "fluPor[1, 1].forward.T": [
+ "fluPor[1, 1].backward.T",
+ "fluPor[1, 1].backward.X_w",
+ "fluPor[2, 1].backward.T",
+ "fluPor[2, 1].backward.X_w",
+ "fan.per.hydraulicEfficiency.V_flow[1]",
+ "fan.per.hydraulicEfficiency.eta[1]",
+ "fan.per.motorEfficiency.V_flow[1]",
+ "fan.per.motorEfficiency.eta[1]",
+ "fan.per.motorCooledByFluid",
+ "fan.m_flow_start",
+ "cooCoi.eps",
+ "con.bandwidth",
+ "con.pre_y_start",
+ "mWat_flow.realTrue",
+ "weaDat.pAtm",
+ "fan2.m_flow_start"
+ ],
+ "fluPor[1, 3].forward.T": [
+ "fluPor[2, 1].backward.T",
+ "fluPor[2, 1].backward.X_w",
+ "fan.m_flow_start",
+ "fan2.m_flow_start"
+ ],
+ "fluPor[1, 1].forward.X_w": [
+ "fluPor[2, 1].backward.X_w",
+ "fan.m_flow_start",
+ "weaDat.pAtm"
+ ],
+ "der(fan.filter.x[1])": [],
+ "fluPor[1, 2].forward.X_w": [
+ "fluPor[2, 1].backward.X_w",
+ "fan.m_flow_start",
+ "fan2.m_flow_start"
+ ],
+ "QGaiRad_flow[2]": [
+ "zer[2].k"
+ ],
+ "fluPor[1, 3].m_flow": [
+ "fan.m_flow_start",
+ "fan2.m_flow_start"
+ ],
+ "fluPor[2, 1].m_flow": [
+ "fan.m_flow_start"
+ ],
+ "weaBus.relHum": [],
+ "QGaiSenCon_flow[1]": [
+ "zer[1].k"
+ ],
+ "fan2.filter.x[2]": [
+ "fan2.m_flow_start"
+ ],
+ "weaBus.celHei": [],
+ "fluPor[1, 3].forward.X_w": [
+ "fluPor[2, 1].backward.X_w",
+ "fan.m_flow_start",
+ "fan2.m_flow_start"
+ ],
+ "fluPor[2, 3].forward.X_w": [
+ "fluPor[1, 1].backward.X_w",
+ "fan.m_flow_start",
+ "fan2.m_flow_start"
+ ],
+ "der(fan2.filter.x[1])": [],
+ "fluPor[2, 2].forward.X_w": [
+ "fluPor[1, 1].backward.X_w",
+ "fan.m_flow_start",
+ "fan2.m_flow_start"
+ ],
+ "der(fan.filter.x[2])": [
+ "fan.riseTime",
+ "fan.m_flow_start"
+ ],
+ "weaBus.HGloHor": [],
+ "QGaiLat_flow[1]": [
+ "zer[1].k"
+ ],
+ "senTemSupAir.T": [
+ "senTemSupAir.T_start"
+ ],
+ "fluPor[1, 2].m_flow": [
+ "fan.m_flow_start",
+ "fan2.m_flow_start"
+ ],
+ "weaBus.solTim": [],
+ "weaBus.solAlt": [],
+ "weaBus.solZen": [],
+ "weaBus.lat": [],
+ "weaBus.winSpe": [],
+ "weaBus.cloTim": [],
+ "QGaiSenCon_flow[2]": [
+ "zer[2].k"
+ ],
+ "weaBus.HDifHor": [],
+ "fan.filter.x[1]": [
+ "fan.riseTime"
+ ],
+ "weaBus.pAtm": [
+ "weaDat.pAtm"
+ ]
+ },
+ "Derivatives": {
+ "der(fan.filter.x[1])": [
+ "fan.filter.x[1]"
+ ],
+ "der(senTemHXOut.T)": [
+ "fluPor[1, 1].backward.T",
+ "fluPor[1, 1].backward.X_w",
+ "fluPor[2, 1].backward.T",
+ "fluPor[2, 1].backward.X_w",
+ "fan.filter.x[2]",
+ "senTemHXOut.T",
+ "fan2.filter.x[2]"
+ ],
+ "der(senTemSupAir.T)": [
+ "fluPor[1, 1].backward.T",
+ "fluPor[1, 1].backward.X_w",
+ "fluPor[2, 1].backward.T",
+ "fluPor[2, 1].backward.X_w",
+ "fan.filter.x[2]",
+ "senTemSupAir.T",
+ "fan2.filter.x[2]"
+ ],
+ "der(fan2.filter.x[2])": [
+ "fan2.filter.x[1]",
+ "fan2.filter.x[2]"
+ ],
+ "der(fan2.filter.x[1])": [
+ "fan2.filter.x[1]"
+ ],
+ "der(fan.filter.x[2])": [
+ "fan.filter.x[1]",
+ "fan.filter.x[2]"
+ ]
+ }
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_Heater_T.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_HeaterCooler_u.txt
similarity index 75%
rename from BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_Heater_T.txt
rename to BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_HeaterCooler_u.txt
index c8cda239..ea4c5df7 100644
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_Heater_T.txt
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_HeaterCooler_u.txt
@@ -1,27 +1,24 @@
-last-generated=2017-05-04
+last-generated=2017-03-10
statistics-fmu-dependencies=
{
"Outputs": {
- "Q_flow": [
- "inlet.m_flow",
- "inlet.forward.T",
- "inlet.forward.X_w",
- "TSet"
- ],
"outlet.m_flow": [
"inlet.m_flow"
],
"inlet.backward.T": [
+ "inlet.m_flow",
"outlet.backward.T",
- "outlet.backward.X_w"
+ "outlet.backward.X_w",
+ "u"
],
"inlet.backward.X_w": [
"outlet.backward.X_w"
],
"outlet.forward.T": [
+ "inlet.m_flow",
"inlet.forward.T",
"inlet.forward.X_w",
- "TSet"
+ "u"
],
"outlet.forward.X_w": [
"inlet.forward.X_w"
@@ -31,26 +28,25 @@ statistics-fmu-dependencies=
]
},
"InitialUnknowns": {
- "Q_flow": [
- "inlet.m_flow",
- "inlet.forward.T",
- "inlet.forward.X_w",
- "TSet"
- ],
"outlet.m_flow": [
"inlet.m_flow"
],
"inlet.backward.T": [
+ "inlet.m_flow",
"outlet.backward.T",
- "outlet.backward.X_w"
+ "outlet.backward.X_w",
+ "Q_flow_nominal",
+ "u"
],
"inlet.backward.X_w": [
"outlet.backward.X_w"
],
"outlet.forward.T": [
+ "inlet.m_flow",
"inlet.forward.T",
"inlet.forward.X_w",
- "TSet"
+ "Q_flow_nominal",
+ "u"
],
"outlet.forward.X_w": [
"inlet.forward.X_w"
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_Humidifier_u.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_Humidifier_u.txt
new file mode 100644
index 00000000..aea3e125
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_Humidifier_u.txt
@@ -0,0 +1,69 @@
+last-generated=2017-04-14
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "outlet.m_flow": [
+ "inlet.m_flow"
+ ],
+ "inlet.backward.T": [
+ "inlet.m_flow",
+ "outlet.backward.T",
+ "outlet.backward.X_w",
+ "u"
+ ],
+ "inlet.backward.X_w": [
+ "inlet.m_flow",
+ "outlet.backward.X_w",
+ "u"
+ ],
+ "outlet.forward.T": [
+ "inlet.m_flow",
+ "inlet.forward.T",
+ "inlet.forward.X_w",
+ "u"
+ ],
+ "outlet.forward.X_w": [
+ "inlet.m_flow",
+ "inlet.forward.X_w",
+ "u"
+ ],
+ "outlet.p": [
+ "inlet.p"
+ ]
+ },
+ "InitialUnknowns": {
+ "outlet.m_flow": [
+ "inlet.m_flow"
+ ],
+ "inlet.backward.T": [
+ "inlet.m_flow",
+ "outlet.backward.T",
+ "outlet.backward.X_w",
+ "mWat_flow_nominal",
+ "u"
+ ],
+ "inlet.backward.X_w": [
+ "inlet.m_flow",
+ "outlet.backward.X_w",
+ "mWat_flow_nominal",
+ "u"
+ ],
+ "outlet.forward.T": [
+ "inlet.m_flow",
+ "inlet.forward.T",
+ "inlet.forward.X_w",
+ "mWat_flow_nominal",
+ "u"
+ ],
+ "outlet.forward.X_w": [
+ "inlet.m_flow",
+ "inlet.forward.X_w",
+ "mWat_flow_nominal",
+ "u"
+ ],
+ "outlet.p": [
+ "inlet.p"
+ ]
+ },
+ "Derivatives": {}
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_IdealSource_m_flow.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_IdealSource_m_flow.txt
new file mode 100644
index 00000000..18f6b90d
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_IdealSource_m_flow.txt
@@ -0,0 +1,45 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "outlet.m_flow": [
+ "m_flow_in"
+ ],
+ "inlet.backward.T": [
+ "outlet.backward.T"
+ ],
+ "inlet.backward.X_w": [
+ "outlet.backward.X_w"
+ ],
+ "outlet.forward.T": [
+ "inlet.forward.T"
+ ],
+ "outlet.forward.X_w": [
+ "inlet.forward.X_w"
+ ],
+ "outlet.p": [
+ "inlet.p"
+ ]
+ },
+ "InitialUnknowns": {
+ "outlet.m_flow": [
+ "m_flow_in"
+ ],
+ "inlet.backward.T": [
+ "outlet.backward.T"
+ ],
+ "inlet.backward.X_w": [
+ "outlet.backward.X_w"
+ ],
+ "outlet.forward.T": [
+ "inlet.forward.T"
+ ],
+ "outlet.forward.X_w": [
+ "inlet.forward.X_w"
+ ],
+ "outlet.p": [
+ "inlet.p"
+ ]
+ },
+ "Derivatives": {}
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_MixingVolume.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_MixingVolume.txt
new file mode 100644
index 00000000..f9bbd401
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_MixingVolume.txt
@@ -0,0 +1,68 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "outlet.m_flow": [
+ "inlet.m_flow"
+ ],
+ "inlet.backward.T": [
+ "vol.dynBal.U",
+ "vol.dynBal.mXi[1]"
+ ],
+ "inlet.backward.X_w": [
+ "vol.dynBal.mXi[1]"
+ ],
+ "outlet.forward.T": [
+ "vol.dynBal.U",
+ "vol.dynBal.mXi[1]"
+ ],
+ "outlet.forward.X_w": [
+ "vol.dynBal.mXi[1]"
+ ],
+ "outlet.p": [
+ "inlet.p"
+ ]
+ },
+ "InitialUnknowns": {
+ "vol.dynBal.mXi[1]": [],
+ "der(vol.dynBal.mXi[1])": [
+ "inlet.m_flow",
+ "inlet.forward.X_w",
+ "outlet.backward.X_w"
+ ],
+ "outlet.m_flow": [
+ "inlet.m_flow"
+ ],
+ "der(vol.dynBal.U)": [
+ "inlet.m_flow",
+ "inlet.forward.T",
+ "inlet.forward.X_w",
+ "outlet.backward.T",
+ "outlet.backward.X_w"
+ ],
+ "inlet.backward.T": [],
+ "inlet.backward.X_w": [],
+ "outlet.forward.T": [],
+ "outlet.forward.X_w": [],
+ "outlet.p": [
+ "inlet.p"
+ ],
+ "vol.dynBal.U": []
+ },
+ "Derivatives": {
+ "der(vol.dynBal.mXi[1])": [
+ "inlet.m_flow",
+ "inlet.forward.X_w",
+ "outlet.backward.X_w",
+ "vol.dynBal.mXi[1]"
+ ],
+ "der(vol.dynBal.U)": [
+ "inlet.m_flow",
+ "inlet.forward.T",
+ "inlet.forward.X_w",
+ "outlet.backward.T",
+ "outlet.backward.X_w",
+ "vol.dynBal.U"
+ ]
+ }
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_PressureDrop.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_PressureDrop.txt
new file mode 100644
index 00000000..7443f0db
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_PressureDrop.txt
@@ -0,0 +1,51 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "outlet.m_flow": [
+ "inlet.m_flow"
+ ],
+ "inlet.backward.T": [
+ "outlet.backward.T",
+ "outlet.backward.X_w"
+ ],
+ "inlet.backward.X_w": [
+ "outlet.backward.X_w"
+ ],
+ "outlet.forward.T": [
+ "inlet.forward.T",
+ "inlet.forward.X_w"
+ ],
+ "outlet.forward.X_w": [
+ "inlet.forward.X_w"
+ ],
+ "outlet.p": [
+ "inlet.m_flow",
+ "inlet.p"
+ ]
+ },
+ "InitialUnknowns": {
+ "outlet.m_flow": [
+ "inlet.m_flow"
+ ],
+ "inlet.backward.T": [
+ "outlet.backward.T",
+ "outlet.backward.X_w"
+ ],
+ "inlet.backward.X_w": [
+ "outlet.backward.X_w"
+ ],
+ "outlet.forward.T": [
+ "inlet.forward.T",
+ "inlet.forward.X_w"
+ ],
+ "outlet.forward.X_w": [
+ "inlet.forward.X_w"
+ ],
+ "outlet.p": [
+ "inlet.m_flow",
+ "inlet.p"
+ ]
+ },
+ "Derivatives": {}
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_ResistanceVolume.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_ResistanceVolume.txt
new file mode 100644
index 00000000..9660b144
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_ResistanceVolume.txt
@@ -0,0 +1,70 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "outlet.m_flow": [
+ "inlet.m_flow"
+ ],
+ "inlet.backward.T": [
+ "vol.dynBal.U",
+ "vol.dynBal.mXi[1]"
+ ],
+ "inlet.backward.X_w": [
+ "vol.dynBal.mXi[1]"
+ ],
+ "outlet.forward.T": [
+ "vol.dynBal.U",
+ "vol.dynBal.mXi[1]"
+ ],
+ "outlet.forward.X_w": [
+ "vol.dynBal.mXi[1]"
+ ],
+ "outlet.p": [
+ "inlet.m_flow",
+ "inlet.p"
+ ]
+ },
+ "InitialUnknowns": {
+ "vol.dynBal.mXi[1]": [],
+ "der(vol.dynBal.mXi[1])": [
+ "inlet.m_flow",
+ "inlet.forward.X_w",
+ "outlet.backward.X_w"
+ ],
+ "outlet.m_flow": [
+ "inlet.m_flow"
+ ],
+ "der(vol.dynBal.U)": [
+ "inlet.m_flow",
+ "inlet.forward.T",
+ "inlet.forward.X_w",
+ "outlet.backward.T",
+ "outlet.backward.X_w"
+ ],
+ "inlet.backward.T": [],
+ "inlet.backward.X_w": [],
+ "outlet.forward.T": [],
+ "outlet.forward.X_w": [],
+ "outlet.p": [
+ "inlet.m_flow",
+ "inlet.p"
+ ],
+ "vol.dynBal.U": []
+ },
+ "Derivatives": {
+ "der(vol.dynBal.mXi[1])": [
+ "inlet.m_flow",
+ "inlet.forward.X_w",
+ "outlet.backward.X_w",
+ "vol.dynBal.mXi[1]"
+ ],
+ "der(vol.dynBal.U)": [
+ "inlet.m_flow",
+ "inlet.forward.T",
+ "inlet.forward.X_w",
+ "outlet.backward.T",
+ "outlet.backward.X_w",
+ "vol.dynBal.U"
+ ]
+ }
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_ThermalZone.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_ThermalZone.txt
new file mode 100644
index 00000000..99e830aa
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_ThermalZone.txt
@@ -0,0 +1,164 @@
+last-generated=2017-04-14
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "weaBus.TDryBul": [],
+ "weaBus.HHorIR": [],
+ "fluPor[2].backward.X_w": [
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ],
+ "weaBus.nOpa": [],
+ "weaBus.solDec": [],
+ "fluPor[2].backward.T": [
+ "vol.dynBal.U",
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ],
+ "weaBus.nTot": [],
+ "weaBus.solHouAng": [],
+ "weaBus.TBlaSky": [],
+ "weaBus.TDewPoi": [],
+ "TOut": [],
+ "weaBus.solTim": [],
+ "fluPor[1].backward.T": [
+ "vol.dynBal.U",
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ],
+ "weaBus.winDir": [],
+ "weaBus.relHum": [],
+ "weaBus.celHei": [],
+ "fluPor[1].backward.X_w": [
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ],
+ "weaBus.lon": [],
+ "TRad": [
+ "vol.dynBal.U",
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ],
+ "weaBus.HGloHor": [],
+ "weaBus.solAlt": [],
+ "weaBus.solZen": [],
+ "weaBus.lat": [],
+ "weaBus.winSpe": [],
+ "weaBus.cloTim": [],
+ "weaBus.HDirNor": [],
+ "weaBus.HDifHor": [],
+ "weaBus.pAtm": []
+ },
+ "InitialUnknowns": {
+ "vol.dynBal.m": [
+ "vol.p_start"
+ ],
+ "weaBus.TDryBul": [],
+ "weaBus.HHorIR": [],
+ "der(vol.dynBal.U)": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.T",
+ "fluPor[1].forward.X_w",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.T",
+ "fluPor[2].forward.X_w",
+ "QRooInt_flow",
+ "theCon.G",
+ "preHea.T_ref",
+ "preHea.alpha",
+ "vol.p_start",
+ "vol.T_start",
+ "vol.X_start[1]"
+ ],
+ "fluPor[2].backward.X_w": [
+ "vol.X_start[1]"
+ ],
+ "der(vol.dynBal.m)": [
+ "fluPor[1].m_flow",
+ "fluPor[2].m_flow"
+ ],
+ "weaBus.nOpa": [],
+ "weaBus.solDec": [],
+ "fluPor[2].backward.T": [
+ "vol.p_start",
+ "vol.T_start",
+ "vol.X_start[1]"
+ ],
+ "weaBus.nTot": [],
+ "weaBus.solHouAng": [],
+ "weaBus.TBlaSky": [],
+ "weaBus.TDewPoi": [],
+ "TOut": [],
+ "der(vol.dynBal.mXi[1])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.X_w",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.X_w",
+ "vol.X_start[1]",
+ "mWat_flow.k"
+ ],
+ "vol.dynBal.U": [
+ "vol.p_start",
+ "vol.T_start",
+ "vol.X_start[1]"
+ ],
+ "vol.dynBal.mXi[1]": [
+ "vol.p_start",
+ "vol.X_start[1]"
+ ],
+ "weaBus.solTim": [],
+ "fluPor[1].backward.T": [
+ "vol.p_start",
+ "vol.T_start",
+ "vol.X_start[1]"
+ ],
+ "weaBus.winDir": [],
+ "weaBus.relHum": [],
+ "weaBus.celHei": [],
+ "fluPor[1].backward.X_w": [
+ "vol.X_start[1]"
+ ],
+ "weaBus.lon": [],
+ "TRad": [
+ "vol.p_start",
+ "vol.T_start",
+ "vol.X_start[1]"
+ ],
+ "weaBus.HGloHor": [],
+ "weaBus.solAlt": [],
+ "weaBus.solZen": [],
+ "weaBus.lat": [],
+ "weaBus.winSpe": [],
+ "weaBus.cloTim": [],
+ "weaBus.HDirNor": [],
+ "weaBus.HDifHor": [],
+ "weaBus.pAtm": [
+ "weaDat.pAtm"
+ ]
+ },
+ "Derivatives": {
+ "der(vol.dynBal.m)": [
+ "fluPor[1].m_flow",
+ "fluPor[2].m_flow"
+ ],
+ "der(vol.dynBal.mXi[1])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.X_w",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.X_w",
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ],
+ "der(vol.dynBal.U)": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.T",
+ "fluPor[1].forward.X_w",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.T",
+ "fluPor[2].forward.X_w",
+ "vol.dynBal.U",
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ]
+ }
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_ThermalZones.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_ThermalZones.txt
new file mode 100644
index 00000000..7abf206b
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_ThermalZones.txt
@@ -0,0 +1,326 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "fluPor[2, 1].backward.X_w": [
+ "vol2.dynBal.m",
+ "vol2.dynBal.mXi[1]"
+ ],
+ "fluPor[2, 3].backward.X_w": [
+ "vol2.dynBal.m",
+ "vol2.dynBal.mXi[1]"
+ ],
+ "weaBus.TDryBul": [],
+ "weaBus.solZen": [],
+ "weaBus.HHorIR": [],
+ "fluPor[1, 1].backward.X_w": [
+ "vol1.dynBal.m",
+ "vol1.dynBal.mXi[1]"
+ ],
+ "weaBus.nOpa": [],
+ "fluPor[1, 2].backward.T": [
+ "vol1.dynBal.U",
+ "vol1.dynBal.m",
+ "vol1.dynBal.mXi[1]"
+ ],
+ "fluPor[2, 2].backward.X_w": [
+ "vol2.dynBal.m",
+ "vol2.dynBal.mXi[1]"
+ ],
+ "fluPor[2, 1].backward.T": [
+ "vol2.dynBal.U",
+ "vol2.dynBal.m",
+ "vol2.dynBal.mXi[1]"
+ ],
+ "weaBus.nTot": [],
+ "weaBus.solDec": [],
+ "weaBus.solHouAng": [],
+ "weaBus.TBlaSky": [],
+ "weaBus.TDewPoi": [],
+ "weaBus.lon": [],
+ "TOut": [],
+ "weaBus.solTim": [],
+ "weaBus.winDir": [],
+ "weaBus.relHum": [],
+ "fluPor[1, 1].backward.T": [
+ "vol1.dynBal.U",
+ "vol1.dynBal.m",
+ "vol1.dynBal.mXi[1]"
+ ],
+ "weaBus.celHei": [],
+ "fluPor[1, 2].backward.X_w": [
+ "vol1.dynBal.m",
+ "vol1.dynBal.mXi[1]"
+ ],
+ "TRad2": [
+ "vol2.dynBal.U",
+ "vol2.dynBal.m",
+ "vol2.dynBal.mXi[1]"
+ ],
+ "TRad1": [
+ "vol1.dynBal.U",
+ "vol1.dynBal.m",
+ "vol1.dynBal.mXi[1]"
+ ],
+ "weaBus.pAtm": [],
+ "weaBus.HGloHor": [],
+ "fluPor[2, 3].backward.T": [
+ "vol2.dynBal.U",
+ "vol2.dynBal.m",
+ "vol2.dynBal.mXi[1]"
+ ],
+ "weaBus.solAlt": [],
+ "fluPor[2, 2].backward.T": [
+ "vol2.dynBal.U",
+ "vol2.dynBal.m",
+ "vol2.dynBal.mXi[1]"
+ ],
+ "weaBus.lat": [],
+ "weaBus.winSpe": [],
+ "fluPor[1, 3].backward.X_w": [
+ "vol1.dynBal.m",
+ "vol1.dynBal.mXi[1]"
+ ],
+ "weaBus.cloTim": [],
+ "weaBus.HDirNor": [],
+ "weaBus.HDifHor": [],
+ "fluPor[1, 3].backward.T": [
+ "vol1.dynBal.U",
+ "vol1.dynBal.m",
+ "vol1.dynBal.mXi[1]"
+ ]
+ },
+ "InitialUnknowns": {
+ "fluPor[2, 1].backward.X_w": [
+ "vol2.X_start[1]"
+ ],
+ "vol1.dynBal.m": [
+ "vol1.p_start"
+ ],
+ "fluPor[2, 3].backward.X_w": [
+ "vol2.X_start[1]"
+ ],
+ "weaBus.TDryBul": [],
+ "weaBus.solZen": [],
+ "weaBus.HHorIR": [],
+ "fluPor[1, 1].backward.X_w": [
+ "vol1.X_start[1]"
+ ],
+ "weaBus.nOpa": [],
+ "fluPor[1, 2].backward.T": [
+ "vol1.p_start",
+ "vol1.T_start",
+ "vol1.X_start[1]"
+ ],
+ "fluPor[2, 2].backward.X_w": [
+ "vol2.X_start[1]"
+ ],
+ "der(vol2.dynBal.mXi[1])": [
+ "fluPor[2, 1].m_flow",
+ "fluPor[2, 1].forward.X_w",
+ "fluPor[2, 2].m_flow",
+ "fluPor[2, 2].forward.X_w",
+ "fluPor[2, 3].m_flow",
+ "fluPor[2, 3].forward.X_w",
+ "vol2.X_start[1]"
+ ],
+ "fluPor[2, 1].backward.T": [
+ "vol2.p_start",
+ "vol2.T_start",
+ "vol2.X_start[1]"
+ ],
+ "weaBus.nTot": [],
+ "weaBus.solDec": [],
+ "weaBus.solHouAng": [],
+ "weaBus.TBlaSky": [],
+ "vol1.dynBal.U": [
+ "vol1.p_start",
+ "vol1.T_start",
+ "vol1.X_start[1]"
+ ],
+ "weaBus.TDewPoi": [],
+ "vol2.dynBal.U": [
+ "vol2.p_start",
+ "vol2.T_start",
+ "vol2.X_start[1]"
+ ],
+ "weaBus.lon": [],
+ "TOut": [],
+ "vol2.dynBal.mXi[1]": [
+ "vol2.p_start",
+ "vol2.X_start[1]"
+ ],
+ "weaBus.solTim": [],
+ "der(vol1.dynBal.m)": [
+ "fluPor[1, 1].m_flow",
+ "fluPor[1, 2].m_flow",
+ "fluPor[1, 3].m_flow"
+ ],
+ "weaBus.winDir": [],
+ "weaBus.relHum": [],
+ "fluPor[1, 1].backward.T": [
+ "vol1.p_start",
+ "vol1.T_start",
+ "vol1.X_start[1]"
+ ],
+ "weaBus.celHei": [],
+ "fluPor[1, 2].backward.X_w": [
+ "vol1.X_start[1]"
+ ],
+ "TRad2": [
+ "vol2.p_start",
+ "vol2.T_start",
+ "vol2.X_start[1]"
+ ],
+ "TRad1": [
+ "vol1.p_start",
+ "vol1.T_start",
+ "vol1.X_start[1]"
+ ],
+ "der(vol2.dynBal.U)": [
+ "fluPor[2, 1].m_flow",
+ "fluPor[2, 1].forward.T",
+ "fluPor[2, 1].forward.X_w",
+ "fluPor[2, 2].m_flow",
+ "fluPor[2, 2].forward.T",
+ "fluPor[2, 2].forward.X_w",
+ "fluPor[2, 3].m_flow",
+ "fluPor[2, 3].forward.T",
+ "fluPor[2, 3].forward.X_w",
+ "QRooInt_flow",
+ "theCon2.G",
+ "preHea2.T_ref",
+ "preHea2.alpha",
+ "vol2.p_start",
+ "vol2.T_start",
+ "vol2.X_start[1]"
+ ],
+ "weaBus.pAtm": [
+ "weaDat.pAtm"
+ ],
+ "weaBus.HGloHor": [],
+ "der(vol1.dynBal.U)": [
+ "fluPor[1, 1].m_flow",
+ "fluPor[1, 1].forward.T",
+ "fluPor[1, 1].forward.X_w",
+ "fluPor[1, 2].m_flow",
+ "fluPor[1, 2].forward.T",
+ "fluPor[1, 2].forward.X_w",
+ "fluPor[1, 3].m_flow",
+ "fluPor[1, 3].forward.T",
+ "fluPor[1, 3].forward.X_w",
+ "QRooInt_flow",
+ "theCon1.G",
+ "preHea1.T_ref",
+ "preHea1.alpha",
+ "vol1.p_start",
+ "vol1.T_start",
+ "vol1.X_start[1]"
+ ],
+ "fluPor[2, 3].backward.T": [
+ "vol2.p_start",
+ "vol2.T_start",
+ "vol2.X_start[1]"
+ ],
+ "vol1.dynBal.mXi[1]": [
+ "vol1.p_start",
+ "vol1.X_start[1]"
+ ],
+ "der(vol1.dynBal.mXi[1])": [
+ "fluPor[1, 1].m_flow",
+ "fluPor[1, 1].forward.X_w",
+ "fluPor[1, 2].m_flow",
+ "fluPor[1, 2].forward.X_w",
+ "fluPor[1, 3].m_flow",
+ "fluPor[1, 3].forward.X_w",
+ "vol1.X_start[1]"
+ ],
+ "weaBus.solAlt": [],
+ "fluPor[2, 2].backward.T": [
+ "vol2.p_start",
+ "vol2.T_start",
+ "vol2.X_start[1]"
+ ],
+ "weaBus.lat": [],
+ "vol2.dynBal.m": [
+ "vol2.p_start"
+ ],
+ "weaBus.winSpe": [],
+ "fluPor[1, 3].backward.X_w": [
+ "vol1.X_start[1]"
+ ],
+ "weaBus.cloTim": [],
+ "weaBus.HDirNor": [],
+ "weaBus.HDifHor": [],
+ "der(vol2.dynBal.m)": [
+ "fluPor[2, 1].m_flow",
+ "fluPor[2, 2].m_flow",
+ "fluPor[2, 3].m_flow"
+ ],
+ "fluPor[1, 3].backward.T": [
+ "vol1.p_start",
+ "vol1.T_start",
+ "vol1.X_start[1]"
+ ]
+ },
+ "Derivatives": {
+ "der(vol1.dynBal.U)": [
+ "fluPor[1, 1].m_flow",
+ "fluPor[1, 1].forward.T",
+ "fluPor[1, 1].forward.X_w",
+ "fluPor[1, 2].m_flow",
+ "fluPor[1, 2].forward.T",
+ "fluPor[1, 2].forward.X_w",
+ "fluPor[1, 3].m_flow",
+ "fluPor[1, 3].forward.T",
+ "fluPor[1, 3].forward.X_w",
+ "vol1.dynBal.U",
+ "vol1.dynBal.m",
+ "vol1.dynBal.mXi[1]"
+ ],
+ "der(vol2.dynBal.mXi[1])": [
+ "fluPor[2, 1].m_flow",
+ "fluPor[2, 1].forward.X_w",
+ "fluPor[2, 2].m_flow",
+ "fluPor[2, 2].forward.X_w",
+ "fluPor[2, 3].m_flow",
+ "fluPor[2, 3].forward.X_w",
+ "vol2.dynBal.m",
+ "vol2.dynBal.mXi[1]"
+ ],
+ "der(vol1.dynBal.m)": [
+ "fluPor[1, 1].m_flow",
+ "fluPor[1, 2].m_flow",
+ "fluPor[1, 3].m_flow"
+ ],
+ "der(vol1.dynBal.mXi[1])": [
+ "fluPor[1, 1].m_flow",
+ "fluPor[1, 1].forward.X_w",
+ "fluPor[1, 2].m_flow",
+ "fluPor[1, 2].forward.X_w",
+ "fluPor[1, 3].m_flow",
+ "fluPor[1, 3].forward.X_w",
+ "vol1.dynBal.m",
+ "vol1.dynBal.mXi[1]"
+ ],
+ "der(vol2.dynBal.U)": [
+ "fluPor[2, 1].m_flow",
+ "fluPor[2, 1].forward.T",
+ "fluPor[2, 1].forward.X_w",
+ "fluPor[2, 2].m_flow",
+ "fluPor[2, 2].forward.T",
+ "fluPor[2, 2].forward.X_w",
+ "fluPor[2, 3].m_flow",
+ "fluPor[2, 3].forward.T",
+ "fluPor[2, 3].forward.X_w",
+ "vol2.dynBal.U",
+ "vol2.dynBal.m",
+ "vol2.dynBal.mXi[1]"
+ ],
+ "der(vol2.dynBal.m)": [
+ "fluPor[2, 1].m_flow",
+ "fluPor[2, 2].m_flow",
+ "fluPor[2, 3].m_flow"
+ ]
+ }
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_TwoPortPassThrough.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_TwoPortPassThrough.txt
new file mode 100644
index 00000000..fa1d772b
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Examples_FMUs_TwoPortPassThrough.txt
@@ -0,0 +1,45 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "outlet.m_flow": [
+ "inlet.m_flow"
+ ],
+ "inlet.backward.T": [
+ "outlet.backward.T"
+ ],
+ "inlet.backward.X_w": [
+ "outlet.backward.X_w"
+ ],
+ "outlet.forward.T": [
+ "inlet.forward.T"
+ ],
+ "outlet.forward.X_w": [
+ "inlet.forward.X_w"
+ ],
+ "outlet.p": [
+ "inlet.p"
+ ]
+ },
+ "InitialUnknowns": {
+ "outlet.m_flow": [
+ "inlet.m_flow"
+ ],
+ "inlet.backward.T": [
+ "outlet.backward.T"
+ ],
+ "inlet.backward.X_w": [
+ "outlet.backward.X_w"
+ ],
+ "outlet.forward.T": [
+ "inlet.forward.T"
+ ],
+ "outlet.forward.X_w": [
+ "inlet.forward.X_w"
+ ],
+ "outlet.p": [
+ "inlet.p"
+ ]
+ },
+ "Derivatives": {}
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_HVACThermalZoneAir1.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_HVACThermalZoneAir1.txt
new file mode 100644
index 00000000..cb02ecff
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_HVACThermalZoneAir1.txt
@@ -0,0 +1,27 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "fluPor[1].forward.X_w": [],
+ "QGaiRad_flow": [],
+ "fluPor[1].forward.T": [],
+ "fluPor[2].m_flow": [],
+ "fluPor[2].forward.X_w": [],
+ "QGaiSenCon_flow": [],
+ "fluPor[1].m_flow": [],
+ "QGaiLat_flow": [],
+ "fluPor[2].forward.T": []
+ },
+ "InitialUnknowns": {
+ "fluPor[1].forward.X_w": [],
+ "QGaiRad_flow": [],
+ "fluPor[1].forward.T": [],
+ "fluPor[2].m_flow": [],
+ "fluPor[2].forward.X_w": [],
+ "QGaiSenCon_flow": [],
+ "fluPor[1].m_flow": [],
+ "QGaiLat_flow": [],
+ "fluPor[2].forward.T": []
+ },
+ "Derivatives": {}
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_HVACThermalZoneAir2.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_HVACThermalZoneAir2.txt
new file mode 100644
index 00000000..21357221
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_HVACThermalZoneAir2.txt
@@ -0,0 +1,31 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "fluPor[2].forward.C[1]": [],
+ "fluPor[1].forward.X_w": [],
+ "QGaiRad_flow": [],
+ "fluPor[1].forward.T": [],
+ "fluPor[2].m_flow": [],
+ "fluPor[2].forward.T": [],
+ "fluPor[2].forward.X_w": [],
+ "QGaiSenCon_flow": [],
+ "fluPor[1].m_flow": [],
+ "QGaiLat_flow": [],
+ "fluPor[1].forward.C[1]": []
+ },
+ "InitialUnknowns": {
+ "fluPor[2].forward.C[1]": [],
+ "fluPor[1].forward.X_w": [],
+ "QGaiRad_flow": [],
+ "fluPor[1].forward.T": [],
+ "fluPor[2].m_flow": [],
+ "fluPor[2].forward.T": [],
+ "fluPor[2].forward.X_w": [],
+ "QGaiSenCon_flow": [],
+ "fluPor[1].m_flow": [],
+ "QGaiLat_flow": [],
+ "fluPor[1].forward.C[1]": []
+ },
+ "Derivatives": {}
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_HVACThermalZoneAir3.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_HVACThermalZoneAir3.txt
new file mode 100644
index 00000000..8ec4a096
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_HVACThermalZoneAir3.txt
@@ -0,0 +1,39 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "fluPor[2].forward.C[1]": [],
+ "fluPor[1].forward.C[3]": [],
+ "fluPor[1].forward.X_w": [],
+ "fluPor[2].forward.C[3]": [],
+ "QGaiRad_flow": [],
+ "fluPor[1].forward.T": [],
+ "fluPor[2].forward.C[2]": [],
+ "fluPor[1].forward.C[2]": [],
+ "fluPor[2].m_flow": [],
+ "fluPor[2].forward.T": [],
+ "fluPor[2].forward.X_w": [],
+ "QGaiSenCon_flow": [],
+ "fluPor[1].m_flow": [],
+ "QGaiLat_flow": [],
+ "fluPor[1].forward.C[1]": []
+ },
+ "InitialUnknowns": {
+ "fluPor[2].forward.C[1]": [],
+ "fluPor[1].forward.C[3]": [],
+ "fluPor[1].forward.X_w": [],
+ "fluPor[2].forward.C[3]": [],
+ "QGaiRad_flow": [],
+ "fluPor[1].forward.T": [],
+ "fluPor[2].forward.C[2]": [],
+ "fluPor[1].forward.C[2]": [],
+ "fluPor[2].m_flow": [],
+ "fluPor[2].forward.T": [],
+ "fluPor[2].forward.X_w": [],
+ "QGaiSenCon_flow": [],
+ "fluPor[1].m_flow": [],
+ "QGaiLat_flow": [],
+ "fluPor[1].forward.C[1]": []
+ },
+ "Derivatives": {}
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_HVACThermalZoneSimpleAir1.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_HVACThermalZoneSimpleAir1.txt
new file mode 100644
index 00000000..007a627a
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_HVACThermalZoneSimpleAir1.txt
@@ -0,0 +1,23 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "fluPor[1].forward.T": [],
+ "QGaiRad_flow": [],
+ "fluPor[2].m_flow": [],
+ "QGaiSenCon_flow": [],
+ "fluPor[1].m_flow": [],
+ "QGaiLat_flow": [],
+ "fluPor[2].forward.T": []
+ },
+ "InitialUnknowns": {
+ "fluPor[1].forward.T": [],
+ "QGaiRad_flow": [],
+ "fluPor[2].m_flow": [],
+ "QGaiSenCon_flow": [],
+ "fluPor[1].m_flow": [],
+ "QGaiLat_flow": [],
+ "fluPor[2].forward.T": []
+ },
+ "Derivatives": {}
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_HVACThermalZoneSimpleAir2.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_HVACThermalZoneSimpleAir2.txt
new file mode 100644
index 00000000..6517ec35
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_HVACThermalZoneSimpleAir2.txt
@@ -0,0 +1,27 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "fluPor[2].forward.C[1]": [],
+ "fluPor[1].forward.T": [],
+ "QGaiRad_flow": [],
+ "fluPor[2].m_flow": [],
+ "fluPor[2].forward.T": [],
+ "QGaiSenCon_flow": [],
+ "fluPor[1].m_flow": [],
+ "QGaiLat_flow": [],
+ "fluPor[1].forward.C[1]": []
+ },
+ "InitialUnknowns": {
+ "fluPor[2].forward.C[1]": [],
+ "fluPor[1].forward.T": [],
+ "QGaiRad_flow": [],
+ "fluPor[2].m_flow": [],
+ "fluPor[2].forward.T": [],
+ "QGaiSenCon_flow": [],
+ "fluPor[1].m_flow": [],
+ "QGaiLat_flow": [],
+ "fluPor[1].forward.C[1]": []
+ },
+ "Derivatives": {}
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_HVACThermalZoneSimpleAir3.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_HVACThermalZoneSimpleAir3.txt
new file mode 100644
index 00000000..995a81fb
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_HVACThermalZoneSimpleAir3.txt
@@ -0,0 +1,35 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "fluPor[2].forward.C[1]": [],
+ "fluPor[1].forward.C[3]": [],
+ "fluPor[1].forward.T": [],
+ "QGaiRad_flow": [],
+ "fluPor[1].forward.C[2]": [],
+ "fluPor[2].forward.C[2]": [],
+ "fluPor[2].forward.C[3]": [],
+ "fluPor[2].m_flow": [],
+ "fluPor[2].forward.T": [],
+ "QGaiSenCon_flow": [],
+ "fluPor[1].m_flow": [],
+ "QGaiLat_flow": [],
+ "fluPor[1].forward.C[1]": []
+ },
+ "InitialUnknowns": {
+ "fluPor[2].forward.C[1]": [],
+ "fluPor[1].forward.C[3]": [],
+ "fluPor[1].forward.T": [],
+ "QGaiRad_flow": [],
+ "fluPor[1].forward.C[2]": [],
+ "fluPor[2].forward.C[2]": [],
+ "fluPor[2].forward.C[3]": [],
+ "fluPor[2].m_flow": [],
+ "fluPor[2].forward.T": [],
+ "QGaiSenCon_flow": [],
+ "fluPor[1].m_flow": [],
+ "QGaiLat_flow": [],
+ "fluPor[1].forward.C[1]": []
+ },
+ "Derivatives": {}
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_ThermalZoneAir1.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_ThermalZoneAir1.txt
new file mode 100644
index 00000000..63fa91e3
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_ThermalZoneAir1.txt
@@ -0,0 +1,109 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "fluPor[2].backward.X_w": [
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ],
+ "fluPor[1].backward.T": [
+ "vol.dynBal.U",
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ],
+ "TOut": [],
+ "fluPor[1].backward.X_w": [
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ],
+ "fluPor[2].backward.T": [
+ "vol.dynBal.U",
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ]
+ },
+ "InitialUnknowns": {
+ "vol.dynBal.mXi[1]": [
+ "vol.p_start",
+ "vol.X_start[1]"
+ ],
+ "fluPor[2].backward.T": [
+ "vol.p_start",
+ "vol.T_start",
+ "vol.X_start[1]"
+ ],
+ "vol.dynBal.m": [
+ "vol.p_start"
+ ],
+ "fluPor[1].backward.T": [
+ "vol.p_start",
+ "vol.T_start",
+ "vol.X_start[1]"
+ ],
+ "der(vol.dynBal.m)": [
+ "fluPor[1].m_flow",
+ "fluPor[2].m_flow"
+ ],
+ "TOut": [
+ "TOutSou.k"
+ ],
+ "der(vol.dynBal.U)": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.T",
+ "fluPor[1].forward.X_w",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.T",
+ "fluPor[2].forward.X_w",
+ "theCon.G",
+ "preHea.T_ref",
+ "preHea.alpha",
+ "vol.p_start",
+ "vol.T_start",
+ "vol.X_start[1]",
+ "TOutSou.k"
+ ],
+ "fluPor[2].backward.X_w": [
+ "vol.X_start[1]"
+ ],
+ "fluPor[1].backward.X_w": [
+ "vol.X_start[1]"
+ ],
+ "der(vol.dynBal.mXi[1])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.X_w",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.X_w",
+ "vol.X_start[1]"
+ ],
+ "vol.dynBal.U": [
+ "vol.p_start",
+ "vol.T_start",
+ "vol.X_start[1]"
+ ]
+ },
+ "Derivatives": {
+ "der(vol.dynBal.m)": [
+ "fluPor[1].m_flow",
+ "fluPor[2].m_flow"
+ ],
+ "der(vol.dynBal.mXi[1])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.X_w",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.X_w",
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ],
+ "der(vol.dynBal.U)": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.T",
+ "fluPor[1].forward.X_w",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.T",
+ "fluPor[2].forward.X_w",
+ "vol.dynBal.U",
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ]
+ }
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_ThermalZoneAir2.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_ThermalZoneAir2.txt
new file mode 100644
index 00000000..1d2189f6
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_ThermalZoneAir2.txt
@@ -0,0 +1,142 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "TOut": [],
+ "fluPor[2].backward.T": [
+ "vol.dynBal.U",
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ],
+ "fluPor[1].backward.T": [
+ "vol.dynBal.U",
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ],
+ "fluPor[2].backward.C[1]": [
+ "vol.dynBal.m",
+ "vol.dynBal.mC[1]"
+ ],
+ "fluPor[2].backward.X_w": [
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ],
+ "fluPor[1].backward.C[1]": [
+ "vol.dynBal.m",
+ "vol.dynBal.mC[1]"
+ ],
+ "fluPor[1].backward.X_w": [
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ]
+ },
+ "InitialUnknowns": {
+ "TOut": [
+ "TOutSou.k"
+ ],
+ "fluPor[2].backward.T": [
+ "vol.p_start",
+ "vol.T_start",
+ "vol.X_start[1]"
+ ],
+ "vol.dynBal.m": [
+ "vol.p_start"
+ ],
+ "vol.dynBal.mXi[1]": [
+ "vol.p_start",
+ "vol.X_start[1]"
+ ],
+ "fluPor[1].backward.T": [
+ "vol.p_start",
+ "vol.T_start",
+ "vol.X_start[1]"
+ ],
+ "der(vol.dynBal.U)": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.T",
+ "fluPor[1].forward.X_w",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.T",
+ "fluPor[2].forward.X_w",
+ "theCon.G",
+ "preHea.T_ref",
+ "preHea.alpha",
+ "vol.p_start",
+ "vol.T_start",
+ "vol.X_start[1]",
+ "TOutSou.k"
+ ],
+ "der(vol.dynBal.m)": [
+ "fluPor[1].m_flow",
+ "fluPor[2].m_flow"
+ ],
+ "vol.dynBal.mC[1]": [
+ "vol.p_start",
+ "vol.C_start[1]"
+ ],
+ "fluPor[2].backward.C[1]": [
+ "vol.C_start[1]"
+ ],
+ "fluPor[2].backward.X_w": [
+ "vol.X_start[1]"
+ ],
+ "fluPor[1].backward.C[1]": [
+ "vol.C_start[1]"
+ ],
+ "fluPor[1].backward.X_w": [
+ "vol.X_start[1]"
+ ],
+ "der(vol.dynBal.mC[1])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.C[1]",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.C[1]",
+ "vol.C_start[1]"
+ ],
+ "der(vol.dynBal.mXi[1])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.X_w",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.X_w",
+ "vol.X_start[1]"
+ ],
+ "vol.dynBal.U": [
+ "vol.p_start",
+ "vol.T_start",
+ "vol.X_start[1]"
+ ]
+ },
+ "Derivatives": {
+ "der(vol.dynBal.mC[1])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.C[1]",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.C[1]",
+ "vol.dynBal.m",
+ "vol.dynBal.mC[1]"
+ ],
+ "der(vol.dynBal.m)": [
+ "fluPor[1].m_flow",
+ "fluPor[2].m_flow"
+ ],
+ "der(vol.dynBal.mXi[1])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.X_w",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.X_w",
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ],
+ "der(vol.dynBal.U)": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.T",
+ "fluPor[1].forward.X_w",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.T",
+ "fluPor[2].forward.X_w",
+ "vol.dynBal.U",
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ]
+ }
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_ThermalZoneAir3.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_ThermalZoneAir3.txt
new file mode 100644
index 00000000..a9cc5c7d
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_ThermalZoneAir3.txt
@@ -0,0 +1,208 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "TOut": [],
+ "fluPor[2].backward.T": [
+ "vol.dynBal.U",
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ],
+ "fluPor[1].backward.T": [
+ "vol.dynBal.U",
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ],
+ "fluPor[2].backward.C[2]": [
+ "vol.dynBal.m",
+ "vol.dynBal.mC[2]"
+ ],
+ "fluPor[2].backward.C[3]": [
+ "vol.dynBal.m",
+ "vol.dynBal.mC[3]"
+ ],
+ "fluPor[1].backward.C[3]": [
+ "vol.dynBal.m",
+ "vol.dynBal.mC[3]"
+ ],
+ "fluPor[2].backward.C[1]": [
+ "vol.dynBal.m",
+ "vol.dynBal.mC[1]"
+ ],
+ "fluPor[2].backward.X_w": [
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ],
+ "fluPor[1].backward.C[1]": [
+ "vol.dynBal.m",
+ "vol.dynBal.mC[1]"
+ ],
+ "fluPor[1].backward.X_w": [
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ],
+ "fluPor[1].backward.C[2]": [
+ "vol.dynBal.m",
+ "vol.dynBal.mC[2]"
+ ]
+ },
+ "InitialUnknowns": {
+ "vol.dynBal.m": [
+ "vol.p_start"
+ ],
+ "der(vol.dynBal.mC[1])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.C[1]",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.C[1]",
+ "vol.C_start[1]"
+ ],
+ "fluPor[2].backward.C[2]": [
+ "vol.C_start[2]"
+ ],
+ "der(vol.dynBal.U)": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.T",
+ "fluPor[1].forward.X_w",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.T",
+ "fluPor[2].forward.X_w",
+ "theCon.G",
+ "preHea.T_ref",
+ "preHea.alpha",
+ "vol.p_start",
+ "vol.T_start",
+ "vol.X_start[1]",
+ "TOutSou.k"
+ ],
+ "fluPor[2].backward.X_w": [
+ "vol.X_start[1]"
+ ],
+ "fluPor[1].backward.C[2]": [
+ "vol.C_start[2]"
+ ],
+ "der(vol.dynBal.mC[2])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.C[2]",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.C[2]",
+ "vol.C_start[2]"
+ ],
+ "fluPor[2].backward.T": [
+ "vol.p_start",
+ "vol.T_start",
+ "vol.X_start[1]"
+ ],
+ "der(vol.dynBal.m)": [
+ "fluPor[1].m_flow",
+ "fluPor[2].m_flow"
+ ],
+ "vol.dynBal.mC[1]": [
+ "vol.p_start",
+ "vol.C_start[1]"
+ ],
+ "der(vol.dynBal.mXi[1])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.X_w",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.X_w",
+ "vol.X_start[1]"
+ ],
+ "vol.dynBal.U": [
+ "vol.p_start",
+ "vol.T_start",
+ "vol.X_start[1]"
+ ],
+ "vol.dynBal.mC[3]": [
+ "vol.p_start",
+ "vol.C_start[3]"
+ ],
+ "fluPor[1].backward.T": [
+ "vol.p_start",
+ "vol.T_start",
+ "vol.X_start[1]"
+ ],
+ "fluPor[2].backward.C[3]": [
+ "vol.C_start[3]"
+ ],
+ "fluPor[1].backward.C[3]": [
+ "vol.C_start[3]"
+ ],
+ "fluPor[2].backward.C[1]": [
+ "vol.C_start[1]"
+ ],
+ "fluPor[1].backward.C[1]": [
+ "vol.C_start[1]"
+ ],
+ "fluPor[1].backward.X_w": [
+ "vol.X_start[1]"
+ ],
+ "vol.dynBal.mC[2]": [
+ "vol.p_start",
+ "vol.C_start[2]"
+ ],
+ "vol.dynBal.mXi[1]": [
+ "vol.p_start",
+ "vol.X_start[1]"
+ ],
+ "der(vol.dynBal.mC[3])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.C[3]",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.C[3]",
+ "vol.C_start[3]"
+ ],
+ "TOut": [
+ "TOutSou.k"
+ ]
+ },
+ "Derivatives": {
+ "der(vol.dynBal.mC[2])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.C[2]",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.C[2]",
+ "vol.dynBal.m",
+ "vol.dynBal.mC[2]"
+ ],
+ "der(vol.dynBal.mC[1])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.C[1]",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.C[1]",
+ "vol.dynBal.m",
+ "vol.dynBal.mC[1]"
+ ],
+ "der(vol.dynBal.mC[3])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.C[3]",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.C[3]",
+ "vol.dynBal.m",
+ "vol.dynBal.mC[3]"
+ ],
+ "der(vol.dynBal.U)": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.T",
+ "fluPor[1].forward.X_w",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.T",
+ "fluPor[2].forward.X_w",
+ "vol.dynBal.U",
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ],
+ "der(vol.dynBal.m)": [
+ "fluPor[1].m_flow",
+ "fluPor[2].m_flow"
+ ],
+ "der(vol.dynBal.mXi[1])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.X_w",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.X_w",
+ "vol.dynBal.m",
+ "vol.dynBal.mXi[1]"
+ ]
+ }
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_ThermalZoneSimpleAir1.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_ThermalZoneSimpleAir1.txt
new file mode 100644
index 00000000..707e04d3
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_ThermalZoneSimpleAir1.txt
@@ -0,0 +1,66 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "fluPor[1].backward.T": [
+ "vol.dynBal.U",
+ "vol.dynBal.m"
+ ],
+ "TOut": [],
+ "fluPor[2].backward.T": [
+ "vol.dynBal.U",
+ "vol.dynBal.m"
+ ]
+ },
+ "InitialUnknowns": {
+ "fluPor[2].backward.T": [
+ "vol.p_start",
+ "vol.T_start"
+ ],
+ "vol.dynBal.m": [
+ "vol.p_start",
+ "vol.T_start"
+ ],
+ "fluPor[1].backward.T": [
+ "vol.p_start",
+ "vol.T_start"
+ ],
+ "der(vol.dynBal.m)": [
+ "fluPor[1].m_flow",
+ "fluPor[2].m_flow"
+ ],
+ "TOut": [
+ "TOutSou.k"
+ ],
+ "der(vol.dynBal.U)": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.T",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.T",
+ "theCon.G",
+ "preHea.T_ref",
+ "preHea.alpha",
+ "vol.p_start",
+ "vol.T_start",
+ "TOutSou.k"
+ ],
+ "vol.dynBal.U": [
+ "vol.p_start",
+ "vol.T_start"
+ ]
+ },
+ "Derivatives": {
+ "der(vol.dynBal.m)": [
+ "fluPor[1].m_flow",
+ "fluPor[2].m_flow"
+ ],
+ "der(vol.dynBal.U)": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.T",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.T",
+ "vol.dynBal.U",
+ "vol.dynBal.m"
+ ]
+ }
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_ThermalZoneSimpleAir2.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_ThermalZoneSimpleAir2.txt
new file mode 100644
index 00000000..f9d63d4d
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_ThermalZoneSimpleAir2.txt
@@ -0,0 +1,100 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "fluPor[1].backward.C[1]": [
+ "vol.dynBal.m",
+ "vol.dynBal.mC[1]"
+ ],
+ "fluPor[1].backward.T": [
+ "vol.dynBal.U",
+ "vol.dynBal.m"
+ ],
+ "fluPor[2].backward.C[1]": [
+ "vol.dynBal.m",
+ "vol.dynBal.mC[1]"
+ ],
+ "fluPor[2].backward.T": [
+ "vol.dynBal.U",
+ "vol.dynBal.m"
+ ],
+ "TOut": []
+ },
+ "InitialUnknowns": {
+ "TOut": [
+ "TOutSou.k"
+ ],
+ "fluPor[2].backward.T": [
+ "vol.p_start",
+ "vol.T_start"
+ ],
+ "vol.dynBal.m": [
+ "vol.p_start",
+ "vol.T_start"
+ ],
+ "fluPor[1].backward.T": [
+ "vol.p_start",
+ "vol.T_start"
+ ],
+ "der(vol.dynBal.m)": [
+ "fluPor[1].m_flow",
+ "fluPor[2].m_flow"
+ ],
+ "vol.dynBal.mC[1]": [
+ "vol.p_start",
+ "vol.T_start",
+ "vol.C_start[1]"
+ ],
+ "fluPor[2].backward.C[1]": [
+ "vol.C_start[1]"
+ ],
+ "der(vol.dynBal.U)": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.T",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.T",
+ "theCon.G",
+ "preHea.T_ref",
+ "preHea.alpha",
+ "vol.p_start",
+ "vol.T_start",
+ "TOutSou.k"
+ ],
+ "fluPor[1].backward.C[1]": [
+ "vol.C_start[1]"
+ ],
+ "der(vol.dynBal.mC[1])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.C[1]",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.C[1]",
+ "vol.C_start[1]"
+ ],
+ "vol.dynBal.U": [
+ "vol.p_start",
+ "vol.T_start"
+ ]
+ },
+ "Derivatives": {
+ "der(vol.dynBal.m)": [
+ "fluPor[1].m_flow",
+ "fluPor[2].m_flow"
+ ],
+ "der(vol.dynBal.mC[1])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.C[1]",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.C[1]",
+ "vol.dynBal.m",
+ "vol.dynBal.mC[1]"
+ ],
+ "der(vol.dynBal.U)": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.T",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.T",
+ "vol.dynBal.U",
+ "vol.dynBal.m"
+ ]
+ }
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_ThermalZoneSimpleAir3.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_ThermalZoneSimpleAir3.txt
new file mode 100644
index 00000000..98530a8b
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_ExportContainers_Validation_FMUs_ThermalZoneSimpleAir3.txt
@@ -0,0 +1,168 @@
+last-generated=2017-03-10
+statistics-fmu-dependencies=
+{
+ "Outputs": {
+ "TOut": [],
+ "fluPor[2].backward.T": [
+ "vol.dynBal.U",
+ "vol.dynBal.m"
+ ],
+ "fluPor[1].backward.T": [
+ "vol.dynBal.U",
+ "vol.dynBal.m"
+ ],
+ "fluPor[2].backward.C[2]": [
+ "vol.dynBal.m",
+ "vol.dynBal.mC[2]"
+ ],
+ "fluPor[2].backward.C[3]": [
+ "vol.dynBal.m",
+ "vol.dynBal.mC[3]"
+ ],
+ "fluPor[1].backward.C[3]": [
+ "vol.dynBal.m",
+ "vol.dynBal.mC[3]"
+ ],
+ "fluPor[2].backward.C[1]": [
+ "vol.dynBal.m",
+ "vol.dynBal.mC[1]"
+ ],
+ "fluPor[1].backward.C[1]": [
+ "vol.dynBal.m",
+ "vol.dynBal.mC[1]"
+ ],
+ "fluPor[1].backward.C[2]": [
+ "vol.dynBal.m",
+ "vol.dynBal.mC[2]"
+ ]
+ },
+ "InitialUnknowns": {
+ "TOut": [
+ "TOutSou.k"
+ ],
+ "der(vol.dynBal.mC[2])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.C[2]",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.C[2]",
+ "vol.C_start[2]"
+ ],
+ "fluPor[2].backward.T": [
+ "vol.p_start",
+ "vol.T_start"
+ ],
+ "vol.dynBal.m": [
+ "vol.p_start",
+ "vol.T_start"
+ ],
+ "der(vol.dynBal.mC[3])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.C[3]",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.C[3]",
+ "vol.C_start[3]"
+ ],
+ "vol.dynBal.mC[3]": [
+ "vol.p_start",
+ "vol.T_start",
+ "vol.C_start[3]"
+ ],
+ "fluPor[1].backward.T": [
+ "vol.p_start",
+ "vol.T_start"
+ ],
+ "vol.dynBal.mC[1]": [
+ "vol.p_start",
+ "vol.T_start",
+ "vol.C_start[1]"
+ ],
+ "der(vol.dynBal.m)": [
+ "fluPor[1].m_flow",
+ "fluPor[2].m_flow"
+ ],
+ "fluPor[2].backward.C[2]": [
+ "vol.C_start[2]"
+ ],
+ "fluPor[2].backward.C[3]": [
+ "vol.C_start[3]"
+ ],
+ "fluPor[1].backward.C[3]": [
+ "vol.C_start[3]"
+ ],
+ "fluPor[2].backward.C[1]": [
+ "vol.C_start[1]"
+ ],
+ "der(vol.dynBal.U)": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.T",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.T",
+ "theCon.G",
+ "preHea.T_ref",
+ "preHea.alpha",
+ "vol.p_start",
+ "vol.T_start",
+ "TOutSou.k"
+ ],
+ "fluPor[1].backward.C[1]": [
+ "vol.C_start[1]"
+ ],
+ "der(vol.dynBal.mC[1])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.C[1]",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.C[1]",
+ "vol.C_start[1]"
+ ],
+ "fluPor[1].backward.C[2]": [
+ "vol.C_start[2]"
+ ],
+ "vol.dynBal.U": [
+ "vol.p_start",
+ "vol.T_start"
+ ],
+ "vol.dynBal.mC[2]": [
+ "vol.p_start",
+ "vol.T_start",
+ "vol.C_start[2]"
+ ]
+ },
+ "Derivatives": {
+ "der(vol.dynBal.mC[3])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.C[3]",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.C[3]",
+ "vol.dynBal.m",
+ "vol.dynBal.mC[3]"
+ ],
+ "der(vol.dynBal.mC[2])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.C[2]",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.C[2]",
+ "vol.dynBal.m",
+ "vol.dynBal.mC[2]"
+ ],
+ "der(vol.dynBal.m)": [
+ "fluPor[1].m_flow",
+ "fluPor[2].m_flow"
+ ],
+ "der(vol.dynBal.mC[1])": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.C[1]",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.C[1]",
+ "vol.dynBal.m",
+ "vol.dynBal.mC[1]"
+ ],
+ "der(vol.dynBal.U)": [
+ "fluPor[1].m_flow",
+ "fluPor[1].forward.T",
+ "fluPor[2].m_flow",
+ "fluPor[2].forward.T",
+ "vol.dynBal.U",
+ "vol.dynBal.m"
+ ]
+ }
+}
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Validation_FlowSplitter_u.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Validation_FlowSplitter_u.txt
new file mode 100644
index 00000000..ec9e7154
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Validation_FlowSplitter_u.txt
@@ -0,0 +1,9 @@
+last-generated=2015-07-28
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+floSpl.outlet[1].m_flow=[0.10000000149011611938, 0.10000000149011611938]
+time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Validation_HeaterFan.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Validation_HeaterFan.txt
new file mode 100644
index 00000000..aa88ee10
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Validation_HeaterFan.txt
@@ -0,0 +1,13 @@
+last-generated=2015-05-29
+statistics-initialization={'linear': '0, 0, 0, 0'}
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+sin.T_in=[303.149993896484375, 303.149993896484375]
+sou.T_in=[293.149993896484375, 293.149993896484375]
+hea.com.vol.T=[295.121337890625, 295.121337890625]
+time=[0., 1.]
+hea.outlet.p=[98000., 98000.]
+sou.outlet.p=[100000., 100000.]
+hea.inlet.p=[100000., 100000.]
+sin.inlet.p=[100000., 100000.]
+floMac.outlet.p=[100000., 100000.]
+floMac.inlet.p=[98000., 98000.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Validation_HeaterFanPressureDriven.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Validation_HeaterFanPressureDriven.txt
new file mode 100644
index 00000000..432d001c
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Validation_HeaterFanPressureDriven.txt
@@ -0,0 +1,14 @@
+last-generated=2015-05-29
+statistics-initialization={'numerical Jacobians': '0', 'nonlinear': '1, 1'}
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+sin.T_in=[303.149993896484375, 303.149993896484375]
+sou.T_in=[293.149993896484375, 293.149993896484375]
+hea.com.vol.T=[295.121337890625, 295.121337890625]
+time=[0., 1.]
+hea.outlet.p=[98000., 98000.]
+sou.outlet.p=[100000., 100000.]
+hea.inlet.p=[100000., 100000.]
+sin.inlet.p=[100000., 100000.]
+floMac.outlet.p=[100000., 100000.]
+floMac.inlet.p=[98000., 98000.]
+floMac.inlet.m_flow=[0.10000000149011611938, 0.10000000149011611938]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Validation_HeaterFan_noReverseFlow.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Validation_HeaterFan_noReverseFlow.txt
new file mode 100644
index 00000000..dfd96cca
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FMI_Validation_HeaterFan_noReverseFlow.txt
@@ -0,0 +1,5 @@
+last-generated=2015-05-29
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+sou.T_in=[293.149993896484375, 293.149993896484375]
+hea.com.vol.T=[295.121337890625, 295.121337890625]
+time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Examples_FlowJunction.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Examples_FlowJunction.txt
new file mode 100644
index 00000000..52413243
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Examples_FlowJunction.txt
@@ -0,0 +1,21 @@
+last-generated=2017-05-01
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "6",
+ "linear": " "
+}
+spl.port_2.m_flow=[0e+00, 1.254549264907837e+00, 1.254549264907837e+00, 1.254549264907837e+00, 1.254549264907837e+00, 1.254549264907837e+00, 1.254549264907837e+00, 1.254549264907837e+00, 1.254549264907837e+00, 1.254549264907837e+00, 1.254549264907837e+00, 1.254549264907837e+00, 1.254549264907837e+00, 1.254549264907837e+00, 1.254549264907837e+00, 1.254549264907837e+00, 1.254549264907837e+00, 1.254549264907837e+00, 1.254549264907837e+00, 1.254549264907837e+00, 1.254549264907837e+00, 1.230236411094666e+00, 1.199700474739075e+00, 1.153489708900452e+00, 1.09545373916626e+00, 1.033183336257935e+00, 9.765214920043945e-01, 9.332724213600159e-01, 8.944326043128966e-01, 8.584067821502687e-01, 8.244028091430664e-01, 7.919346690177917e-01, 7.60673463344574e-01, 7.30383038520813e-01, 7.008869051933289e-01, 6.720488667488098e-01, 6.437601447105408e-01, 6.15932285785675e-01, 5.884960293769836e-01, 5.609005689620972e-01, 5.329399704933167e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 5.329192280769348e-01, 4.726172983646393e-01, 4.052659273147583e-01, 3.312770426273346e-01, 2.505634725093842e-01, 1.628448069095612e-01, 6.78718313574791e-02, -3.556106612086296e-02, -1.503978818655014e-01, -2.93470025062561e-01, -4.521415531635284e-01, -5.85240364074707e-01, -6.912903189659119e-01, -7.866913080215454e-01, -8.733980655670166e-01, -9.527389407157898e-01, -1.02557361125946e+00, -1.092360258102417e+00, -1.153154850006104e+00, -1.207534670829773e+00, -1.254538774490356e+00, -1.254549264907837e+00, -1.254549264907837e+00, -1.254549264907837e+00, -1.254549264907837e+00, -1.254549264907837e+00, -1.254549264907837e+00, -1.254549264907837e+00, -1.254549264907837e+00, -1.254549264907837e+00, -1.254549264907837e+00]
+spl.port_3.m_flow=[-1.732050776481628e+00, -7.929724454879761e-01, -7.929724454879761e-01, -7.929724454879761e-01, -7.929724454879761e-01, -7.929724454879761e-01, -7.929724454879761e-01, -7.929724454879761e-01, -7.929724454879761e-01, -7.929724454879761e-01, -7.929724454879761e-01, -7.929724454879761e-01, -7.929724454879761e-01, -7.929724454879761e-01, -7.929724454879761e-01, -7.929724454879761e-01, -7.929724454879761e-01, -7.929724454879761e-01, -7.929724454879761e-01, -7.929724454879761e-01, -7.929724454879761e-01, -8.535205125808716e-01, -9.171031713485718e-01, -1.002093911170959e+00, -1.095432162284851e+00, -1.182708024978638e+00, -1.252840280532837e+00, -1.301347017288208e+00, -1.341635346412659e+00, -1.37648344039917e+00, -1.407316565513611e+00, -1.435011863708496e+00, -1.460158824920654e+00, -1.483175992965698e+00, -1.504372358322144e+00, -1.523983478546143e+00, -1.542193055152893e+00, -1.559147596359253e+00, -1.574946522712708e+00, -1.589497804641724e+00, -1.602489352226257e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.602498412132263e+00, -1.530511379241943e+00, -1.452512383460999e+00, -1.368450999259949e+00, -1.27807354927063e+00, -1.180750131607056e+00, -1.075383186340332e+00, -9.606119394302368e-01, -8.331828117370605e-01, -6.729086637496948e-01, -4.90201473236084e-01, -3.250287175178528e-01, -1.810265630483627e-01, -4.42359633743763e-02, 8.696585148572922e-02, 2.137946337461472e-01, 3.370955288410187e-01, 4.573120772838593e-01, 5.743285417556763e-01, 6.870858073234558e-01, 7.930012941360474e-01, 7.929724454879761e-01, 7.929724454879761e-01, 7.929724454879761e-01, 7.929724454879761e-01, 7.929724454879761e-01, 7.929724454879761e-01, 7.929724454879761e-01, 7.929724454879761e-01, 7.929724454879761e-01, 7.929724454879761e-01]
+spl.port_1.m_flow=[-1e+00, -4.615767598152161e-01, -4.615767598152161e-01, -4.615767598152161e-01, -4.615767598152161e-01, -4.615767598152161e-01, -4.615767598152161e-01, -4.615767598152161e-01, -4.615767598152161e-01, -4.615767598152161e-01, -4.615767598152161e-01, -4.615767598152161e-01, -4.615767598152161e-01, -4.615767598152161e-01, -4.615767598152161e-01, -4.615767598152161e-01, -4.615767598152161e-01, -4.615767598152161e-01, -4.615767598152161e-01, -4.615767598152161e-01, -4.615767598152161e-01, -3.784960210323334e-01, -2.831635177135468e-01, -1.53503954410553e-01, 4.440919292392209e-05, 1.495884507894516e-01, 2.763464152812958e-01, 3.681014478206635e-01, 4.472189843654635e-01, 5.181034207344053e-01, 5.829408168792725e-01, 6.431020498275757e-01, 6.995084285736084e-01, 7.528144717216492e-01, 8.035055994987488e-01, 8.519535064697266e-01, 8.984506130218506e-01, 9.432318210601807e-01, 9.864994883537292e-01, 1.028509736061096e+00, 1.069583654403687e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.069579243659973e+00, 1.057912230491638e+00, 1.047251582145691e+00, 1.037198424339294e+00, 1.027379870414734e+00, 1.017485380172729e+00, 1.007232308387756e+00, 9.961968660354614e-01, 9.836131930351257e-01, 9.664223194122314e-01, 9.42392110824585e-01, 9.103357195854187e-01, 8.723868727684021e-01, 8.30998420715332e-01, 7.865036129951477e-01, 7.390157580375671e-01, 6.885488033294678e-01, 6.351177096366882e-01, 5.788928866386414e-01, 5.205093026161194e-01, 4.615910053253174e-01, 4.615767598152161e-01, 4.615767598152161e-01, 4.615767598152161e-01, 4.615767598152161e-01, 4.615767598152161e-01, 4.615767598152161e-01, 4.615767598152161e-01, 4.615767598152161e-01, 4.615767598152161e-01, 4.615767598152161e-01]
+time=[0e+00, 1e+02]
+spl.port_1.p=[1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.013205e+05, 1.01321e+05, 1.013215e+05, 1.01322e+05, 1.013225e+05, 1.01323e+05, 1.013235e+05, 1.01324e+05, 1.013245e+05, 1.01325e+05, 1.013255e+05, 1.01326e+05, 1.013265e+05, 1.01327e+05, 1.013275e+05, 1.01328e+05, 1.013285e+05, 1.01329e+05, 1.013295e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05]
+spl.port_3.p=[1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.013205e+05, 1.01321e+05, 1.013215e+05, 1.01322e+05, 1.013225e+05, 1.01323e+05, 1.013235e+05, 1.01324e+05, 1.013245e+05, 1.01325e+05, 1.013255e+05, 1.01326e+05, 1.013265e+05, 1.01327e+05, 1.013275e+05, 1.01328e+05, 1.013285e+05, 1.01329e+05, 1.013295e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05]
+spl.port_2.p=[1.01325e+05, 1.01325e+05]
+spl.res3.dp=[-5e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.216296195983887e+00, -1.40179705619812e+00, -1.673653602600098e+00, -1.999952673912048e+00, -2.331330299377441e+00, -2.61601448059082e+00, -2.822506666183472e+00, -2.999975919723511e+00, -3.157844305038452e+00, -3.300900220870972e+00, -3.432098627090454e+00, -3.553439617156982e+00, -3.666351556777954e+00, -3.771893739700317e+00, -3.870875835418701e+00, -3.963932275772095e+00, -4.051568508148193e+00, -4.13409423828125e+00, -4.21083927154541e+00, -4.279953479766846e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -4.280001640319824e+00, -3.904108285903931e+00, -3.516320466995239e+00, -3.121097087860107e+00, -2.722453117370605e+00, -2.323617935180664e+00, -1.927414894104004e+00, -1.537958741188049e+00, -1.162525177001953e+00, -8.301397562026978e-01, -5.594855546951294e-01, -3.56444388628006e-01, -1.947056800127029e-01, -4.720810800790787e-02, 9.293954074382782e-02, 2.307213544845581e-01, 3.704971671104431e-01, 5.168724656105042e-01, 6.755849123001099e-01, 8.546497225761414e-01, 1.065331339836121e+00, 1.065265536308289e+00, 1.065265536308289e+00, 1.065265536308289e+00, 1.065265536308289e+00, 1.065265536308289e+00, 1.065265536308289e+00, 1.065265536308289e+00, 1.065265536308289e+00, 1.065265536308289e+00, 1.065265536308289e+00]
+spl.res2.dp=[0e+00, 3.934734344482422e+00, 3.934734344482422e+00, 3.934734344482422e+00, 3.934734344482422e+00, 3.934734344482422e+00, 3.934734344482422e+00, 3.934734344482422e+00, 3.934734344482422e+00, 3.934734344482422e+00, 3.934734344482422e+00, 3.934734344482422e+00, 3.934734344482422e+00, 3.934734344482422e+00, 3.934734344482422e+00, 3.934734344482422e+00, 3.934734344482422e+00, 3.934734344482422e+00, 3.934734344482422e+00, 3.934734344482422e+00, 3.934734344482422e+00, 3.783703804016113e+00, 3.59820294380188e+00, 3.326346397399902e+00, 3.000047445297241e+00, 2.668669700622559e+00, 2.38398551940918e+00, 2.177493333816528e+00, 2.000024080276489e+00, 1.842155575752259e+00, 1.699099898338318e+00, 1.567901372909546e+00, 1.446560263633728e+00, 1.333648324012756e+00, 1.228106260299683e+00, 1.129124045372009e+00, 1.036067724227905e+00, 9.484314918518066e-01, 8.659060001373291e-01, 7.891609072685242e-01, 7.200464010238647e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 7.199981808662415e-01, 5.958915948867798e-01, 4.836795330047607e-01, 3.789028525352478e-01, 2.775468528270721e-01, 1.763820201158524e-01, 7.258512824773788e-02, -3.795880079269409e-02, -1.625252068042755e-01, -3.301397562026978e-01, -5.594855546951294e-01, -8.564444184303284e-01, -1.194705724716187e+00, -1.547208070755005e+00, -1.907060503959656e+00, -2.269278764724731e+00, -2.629502773284912e+00, -2.983127593994141e+00, -3.32441520690918e+00, -3.645350217819214e+00, -3.934668779373169e+00, -3.934734344482422e+00, -3.934734344482422e+00, -3.934734344482422e+00, -3.934734344482422e+00, -3.934734344482422e+00, -3.934734344482422e+00, -3.934734344482422e+00, -3.934734344482422e+00, -3.934734344482422e+00, -3.934734344482422e+00]
+spl.res1.dp=[-5e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -1.065265536308289e+00, -7.162961363792419e-01, -4.017970263957977e-01, -1.736536175012589e-01, 4.736980554298498e-05, 1.686697602272034e-01, 3.839855194091797e-01, 6.774933934211731e-01, 1.00002408027649e+00, 1.342155575752257e+00, 1.699099898338318e+00, 2.067901372909546e+00, 2.446560382843018e+00, 2.833648443222046e+00, 3.228106260299683e+00, 3.629124164581299e+00, 4.036067962646484e+00, 4.448431491851807e+00, 4.86590576171875e+00, 5.28916072845459e+00, 5.720046520233154e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.719998359680176e+00, 5.59589147567749e+00, 5.483679294586182e+00, 5.378902912139893e+00, 5.277546882629395e+00, 5.176382064819336e+00, 5.072585105895996e+00, 4.96204137802124e+00, 4.837474822998047e+00, 4.669860363006592e+00, 4.44051456451416e+00, 4.143555641174316e+00, 3.805294275283813e+00, 3.452791929244995e+00, 3.092939615249634e+00, 2.730721235275269e+00, 2.370497226715088e+00, 2.016872406005859e+00, 1.67558491230011e+00, 1.354649662971497e+00, 1.065331339836121e+00, 1.065265536308289e+00, 1.065265536308289e+00, 1.065265536308289e+00, 1.065265536308289e+00, 1.065265536308289e+00, 1.065265536308289e+00, 1.065265536308289e+00, 1.065265536308289e+00, 1.065265536308289e+00, 1.065265536308289e+00]
+senTem2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931298522949219e+02, 2.928142395019531e+02, 2.921016845703125e+02, 2.910341186523438e+02, 2.898083190917969e+02, 2.886518249511719e+02, 2.876712646484375e+02, 2.868968811035156e+02, 2.863435363769531e+02, 2.860137329101562e+02, 2.85891357421875e+02, 2.859513854980469e+02, 2.861665649414062e+02, 2.865103454589844e+02, 2.86943359375e+02, 2.874114074707031e+02, 2.878837280273438e+02, 2.883445129394531e+02, 2.887864990234375e+02, 2.892066955566406e+02, 2.8960400390625e+02, 2.899786071777344e+02, 2.903311767578125e+02, 2.906627197265625e+02]
+senTem3.T=[2.931499938964844e+02, 2.931493225097656e+02, 2.931488647460938e+02, 2.931485290527344e+02, 2.931483154296875e+02, 2.93148193359375e+02, 2.931480712890625e+02, 2.931480102539062e+02, 2.931480102539062e+02, 2.931480102539062e+02, 2.931480407714844e+02, 2.931480712890625e+02, 2.931481323242188e+02, 2.93148193359375e+02, 2.931482543945312e+02, 2.931483459472656e+02, 2.931484375e+02, 2.931484985351562e+02, 2.931485900878906e+02, 2.93148681640625e+02, 2.931487731933594e+02, 2.931488647460938e+02, 2.931489868164062e+02, 2.93149169921875e+02, 2.931493835449219e+02, 2.931451110839844e+02, 2.931175231933594e+02, 2.930536804199219e+02, 2.929517822265625e+02, 2.928145141601562e+02, 2.926464233398438e+02, 2.924525756835938e+02, 2.922379150390625e+02, 2.920068664550781e+02, 2.917633361816406e+02, 2.915106506347656e+02, 2.912515869140625e+02, 2.909884338378906e+02, 2.907230834960938e+02, 2.904570922851562e+02, 2.901917114257812e+02, 2.899302062988281e+02, 2.896786804199219e+02, 2.894403991699219e+02, 2.892168579101562e+02, 2.890086059570312e+02, 2.888152465820312e+02, 2.886361083984375e+02, 2.884703674316406e+02, 2.88317138671875e+02, 2.881755676269531e+02, 2.880447998046875e+02, 2.879240417480469e+02, 2.878125305175781e+02, 2.877095947265625e+02, 2.876145629882812e+02, 2.8752685546875e+02, 2.874458923339844e+02, 2.873711853027344e+02, 2.873022155761719e+02, 2.872385559082031e+02, 2.871798095703125e+02, 2.871255798339844e+02, 2.870755310058594e+02, 2.870293273925781e+02, 2.869866943359375e+02, 2.869473571777344e+02, 2.869110412597656e+02, 2.868775024414062e+02, 2.868465881347656e+02, 2.868180236816406e+02, 2.867908630371094e+02, 2.86760009765625e+02, 2.867215270996094e+02, 2.866728820800781e+02, 2.866124267578125e+02, 2.8653955078125e+02, 2.864543762207031e+02, 2.863616027832031e+02, 2.862712707519531e+02, 2.861927795410156e+02, 2.86131103515625e+02, 2.860876770019531e+02, 2.8606591796875e+02, 2.862294311523438e+02, 2.870583190917969e+02, 2.884713134765625e+02, 2.902929382324219e+02, 2.923251342773438e+02, 2.9437890625e+02, 2.962979431152344e+02, 2.978897094726562e+02, 2.991117858886719e+02, 3.000495910644531e+02, 3.007697448730469e+02, 3.013227844238281e+02, 3.01747314453125e+02, 3.020732116699219e+02, 3.023233642578125e+02, 3.025154418945312e+02, 3.02662841796875e+02]
+senTem1.T=[2.931499938964844e+02, 2.9314892578125e+02, 2.931483459472656e+02, 2.931480102539062e+02, 2.931478576660156e+02, 2.931477966308594e+02, 2.931477661132812e+02, 2.931477966308594e+02, 2.931478271484375e+02, 2.931479187011719e+02, 2.931480102539062e+02, 2.931481018066406e+02, 2.93148193359375e+02, 2.931482849121094e+02, 2.931483764648438e+02, 2.931484680175781e+02, 2.931485595703125e+02, 2.931486511230469e+02, 2.931487426757812e+02, 2.931488342285156e+02, 2.9314892578125e+02, 2.931490173339844e+02, 2.931491088867188e+02, 2.93149169921875e+02, 2.931490173339844e+02, 2.924203186035156e+02, 2.906181335449219e+02, 2.885528869628906e+02, 2.867411499023438e+02, 2.853648071289062e+02, 2.844268798828125e+02, 2.838416137695312e+02, 2.835033874511719e+02, 2.833208312988281e+02, 2.832283935546875e+02, 2.831842651367188e+02, 2.831642761230469e+02, 2.8315576171875e+02, 2.831524658203125e+02, 2.831511840820312e+02, 2.831504211425781e+02, 2.83150146484375e+02, 2.831500549316406e+02, 2.831500244140625e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Examples_HydraulicDiameter.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Examples_HydraulicDiameter.txt
new file mode 100644
index 00000000..e508cae8
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Examples_HydraulicDiameter.txt
@@ -0,0 +1,12 @@
+last-generated=2016-12-01
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+res.m_flow=[-0.8086287379264831543, -0.80050158482395339377, -0.79229110442423078542, -0.78399467412274570499, -0.77560943289640082998, -0.76713258091466307587, -0.75856101397173536505, -0.74989146020142571913, -0.74112045606969767508, -0.73224449476680386617, -0.72325950995527044096, -0.71416157429410387358, -0.70494615782534508774, -0.69560873059618644199, -0.68614423331716412058, -0.67654735425184042708, -0.66681235677454253619, -0.65693307100626074924, -0.64690298563878867455, -0.63671487324572739741, -0.62636113477404442573, -0.61583327549711330828, -0.60512232651411590467, -0.59421831827684945537, -0.58311044567129655114, -0.5717868804931640625, -0.56023441629801018493, -0.54843868101488169042, -0.53638363029514535274, -0.52405129819514673084, -0.5114217552585363924, -0.49847224666675138405, -0.48517723904986637118, -0.47150753761540775688, -0.45742950353035310984, -0.4429041953008978072, -0.42788612040634027567, -0.41232136645223144145, -0.3961455444929971037, -0.37928048278931969506, -0.36162976502890797903, -0.34307210952046646169, -0.32345146253349532639, -0.30256117925114711653, -0.28011720811344248405, -0.25571083923339288368, -0.2287147727827837651, -0.19807277219517094302, -0.16172570008460743218, -0.11435742665449426247, 0., 0.11435742665371873006, 0.1617258198835192784, 0.19807286912152219371, 0.22871468708538625347, 0.25571083923385184988, 0.28011720811335899528, 0.30256117925091829957, 0.32345152273993071912, 0.34307216608526092116, 0.36162971097849955227, 0.37928048278968884421, 0.39614554449311489837, 0.4123213664521191979, 0.42788612040601570197, 0.44290423921191596213, 0.45742946082738172864, 0.47150749627098997863, 0.48517723905001047813, 0.49847224666679779137, 0.51142175525830968486, 0.52405133534159886732, 0.53638359388880929579, 0.54843864546119147629, 0.56023441629817638532, 0.5717868804931640625, 0.58311046237189556596, 0.59421833464385609425, 0.60512235866490360348, 0.61583325964838575572, 0.6263611192028953889, 0.63671487324569087107, 0.64690298563868109394, 0.65693308581547060765, 0.66681238596564762489, 0.67654732542339224288, 0.68614421909879663719, 0.69560873059625327741, 0.70494616473355253827, 0.71416158792127393262, 0.72325953013743116138, 0.73224446812885346514, 0.74112044290713985362, 0.74989145369779119932, 0.75856101718194479666, 0.76713259042987980152, 0.77560945172132955694, 0.78399465079514318866, 0.79229108903625111715, 0.80050157720906567338, 0.8086287379264831543]
+res.m_flow_nominal=[0.20000000298023223877, 0.20000000298023223877]
+time=[0., 1.]
+res.v=[-4.04314374923706054688, -4.00250816253831942504, -3.96145558172575862343, -3.91997313219522913741, -3.87804722408662216893, -3.8356628449686485105, -3.79280495064942702044, -3.74945712219322979664, -3.70560239955777781518, -3.66122223541554658865, -3.61629772859019782416, -3.57080769265662034684, -3.52473090833569502323, -3.47804377218965310448, -3.43072128579510993163, -3.38273671165455747101, -3.33406160505931126181, -3.2846653550313038572, -3.23451498779773549686, -3.18357442583313954287, -3.13180567387039987537, -3.07916637748576205169, -3.02561163257054355213, -2.97109177019768422312, -2.91555234756561265641, -2.8589344024658203125, -2.80117196228104514688, -2.74219352428401785815, -2.68191815147572709677, -2.62025661018377942213, -2.55710871668874739626, -2.49236108432225167419, -2.42588610584236441525, -2.35753759866968071179, -2.28714754745408788139, -2.21452088709796601762, -2.13943063183445003617, -2.06160692166762693489, -1.98072775226730812825, -1.89640235434259318836, -1.80814891455132942255, -1.71536060720681726721, -1.61725734246979913067, -1.51280589625584216407, -1.40058598096274522504, -1.27855416636464203073, -1.14357387881489347414, -0.99036387587700691615, -0.80862851532419843803, -0.57178714072294534176, 0., 0.57178714071906766581, 0.80862911431847339649, 0.99036436050941156761, 1.14357345032809254448, 1.27855416636693686172, 1.40058598096232778119, 1.51280589625469796822, 1.61725764350197587227, 1.71536089002938618719, 1.80814864429768862308, 1.89640235434443904516, 1.98072775226789699055, 2.06160692166706560613, 2.13943063183282733419, 2.21452110665403356649, 2.28714733393923097537, 2.35753739194823142, 2.42588610584308517204, 2.49236108432248348876, 2.55710871668761452469, 2.62025679591728399842, 2.68191796944234095434, 2.74219334651581503337, 2.80117196228187648188, 2.8589344024658203125, 2.91555243106791461827, 2.9710918520309408386, 3.02561179332281282583, 3.07916629824256826709, 3.13180559601412156212, 3.18357442583295702221, 3.23451498779719770482, 3.28466542907735270518, 3.3340617510182117833, 3.3827365675130272038, 3.43072121470199409288, 3.47804377218998750365, 3.52473094287719401763, 3.57080776079286144054, 3.61629782949966882555, 3.6612221022295963202, 3.70560233374498881886, 3.74945708967608748452, 3.79280496670050526475, 3.83566289254439896084, 3.87804731821001347214, 3.91997301556054722482, 3.96145550478419528062, 4.00250812446277048906, 4.04314374923706054688]
+res.dh=[0.46065887808799743652, 0.46065887808799743652]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Examples_PressureDrop.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Examples_PressureDrop.txt
new file mode 100644
index 00000000..1e49970d
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Examples_PressureDrop.txt
@@ -0,0 +1,10 @@
+last-generated=2017-05-01
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+res.m_flow=[-2.000000029802322e-01, -1.979898958946231e-01, -1.959591805021437e-01, -1.939072011516565e-01, -1.918332574885402e-01, -1.897366644520932e-01, -1.876166311024133e-01, -1.854723692582306e-01, -1.833030279544347e-01, -1.811077006599772e-01, -1.788854453315187e-01, -1.766352205117044e-01, -1.743559533156626e-01, -1.720465112551915e-01, -1.697056294890468e-01, -1.673320099037958e-01, -1.649242183820423e-01, -1.624807719811363e-01, -1.599999982090629e-01, -1.574801498546433e-01, -1.549193419747568e-01, -1.523154658712195e-01, -1.49666294136362e-01, -1.469693791280017e-01, -1.442220494145431e-01, -1.414213627576828e-01, -1.385640623400149e-01, -1.356465997078498e-01, -1.326649937639523e-01, -1.296148125345321e-01, -1.264911033563857e-01, -1.232882820334267e-01, -1.199999949269616e-01, -1.166190400862151e-01, -1.13137082525932e-01, -1.09544505975423e-01, -1.058300563925127e-01, -1.019803900276839e-01, -9.797958834188632e-02, -9.38083095666595e-02, -8.944272515175461e-02, -8.485281297903036e-02, -7.999999161387633e-02, -7.483315102402641e-02, -6.928203116120561e-02, -6.324554218165301e-02, -5.649876082379961e-02, -4.748456791606166e-02, -3.469959892482991e-02, -1.838472658598184e-02, 0e+00, 1.838472658573401e-02, 3.469964244690851e-02, 4.748459906110715e-02, 5.649873818139389e-02, 6.324554218176653e-02, 6.928203116118495e-02, 7.483315102396981e-02, 8.000000650484644e-02, 8.485282696927646e-02, 8.944271178323525e-02, 9.380830956675082e-02, 9.797958834191545e-02, 1.019803900276561e-01, 1.058300563924324e-01, 1.095445168360728e-01, 1.131370719642118e-01, 1.166190298603946e-01, 1.199999949269973e-01, 1.232882820334382e-01, 1.264911033563297e-01, 1.296148217220524e-01, 1.326649847593913e-01, 1.356465909143014e-01, 1.38564062340056e-01, 1.414213627576828e-01, 1.442220535451335e-01, 1.469693831760115e-01, 1.496663020881202e-01, 1.523154619512251e-01, 1.549193381234691e-01, 1.574801498546343e-01, 1.599999982090363e-01, 1.624807756439156e-01, 1.649242256020242e-01, 1.673320027736878e-01, 1.69705625972313e-01, 1.72046511255208e-01, 1.743559550243205e-01, 1.766352238820822e-01, 1.78885450323103e-01, 1.811076940717116e-01, 1.833030246988776e-01, 1.854723676496923e-01, 1.876166318964068e-01, 1.897366668055015e-01, 1.918332621444801e-01, 1.939071953819967e-01, 1.959591766960876e-01, 1.979898940111624e-01, 2.000000029802322e-01]
+res.m_flow_nominal=[2.000000029802322e-01, 2.000000029802322e-01]
+time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_FlowJunctionSteadyState.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_FlowJunctionSteadyState.txt
new file mode 100644
index 00000000..e2931ae2
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_FlowJunctionSteadyState.txt
@@ -0,0 +1,26 @@
+last-generated=2017-05-01
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "number of continuous time states": "3",
+ "linear": " "
+}
+spl.port_2.m_flow=[1.287267327308655e+00, 1.287267327308655e+00, 1.287267327308655e+00, 1.287267327308655e+00, 1.287267327308655e+00, 1.287267327308655e+00, 1.287267327308655e+00, 1.287267327308655e+00, 1.287267327308655e+00, 1.287267327308655e+00, 1.287267327308655e+00, 1.287267327308655e+00, 1.287267327308655e+00, 1.287267327308655e+00, 1.287267327308655e+00, 1.287267327308655e+00, 1.287267327308655e+00, 1.287267327308655e+00, 1.287267327308655e+00, 1.287267327308655e+00, 1.287267327308655e+00, 1.246210098266602e+00, 1.19638466835022e+00, 1.135645270347595e+00, 1.063762784004211e+00, 9.832793474197388e-01, 8.944271802902222e-01, 7.963473796844482e-01, 6.878252625465389e-01, 5.693882107734685e-01, 4.373256266117096e-01, 2.977270781993866e-01, 1.635985672473907e-01, 3.922434896230698e-02, -7.52323642373085e-02, -1.804605424404144e-01, -2.771003544330597e-01, -3.654724359512329e-01, -4.454488158226013e-01, -5.164089202880859e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -5.778593420982361e-01, -6.055359244346619e-01, -6.332747936248779e-01, -6.612197756767273e-01, -6.894263029098511e-01, -7.179581522941589e-01, -7.468900680541992e-01, -7.763117551803589e-01, -8.063331842422485e-01, -8.370932340621948e-01, -8.687723875045776e-01, -9.01614785194397e-01, -9.362119436264038e-01, -9.767902493476868e-01, -1.023600220680237e+00, -1.073111534118652e+00, -1.122618913650513e+00, -1.170298218727112e+00, -1.214696049690247e+00, -1.254305839538574e+00, -1.287267327308655e+00, -1.287267327308655e+00, -1.287267327308655e+00, -1.287267327308655e+00, -1.287267327308655e+00, -1.287267327308655e+00, -1.287267327308655e+00, -1.287267327308655e+00, -1.287267327308655e+00, -1.287267327308655e+00, -1.287267327308655e+00]
+spl.port_3.m_flow=[-4.590849876403809e-01, -4.590849876403809e-01, -4.590849876403809e-01, -4.590849876403809e-01, -4.590849876403809e-01, -4.590849876403809e-01, -4.590849876403809e-01, -4.590849876403809e-01, -4.590849876403809e-01, -4.590849876403809e-01, -4.590849876403809e-01, -4.590849876403809e-01, -4.590849876403809e-01, -4.590849876403809e-01, -4.590849876403809e-01, -4.590849876403809e-01, -4.590849876403809e-01, -4.590849876403809e-01, -4.590849876403809e-01, -4.590849876403809e-01, -4.590849876403809e-01, -5.434149503707886e-01, -6.157184243202209e-01, -6.881423592567444e-01, -7.608804702758789e-01, -8.299244046211243e-01, -8.944271802902222e-01, -9.54229474067688e-01, -1.008925676345825e+00, -1.056802272796631e+00, -1.091237664222717e+00, -1.115287065505981e+00, -1.13405179977417e+00, -1.149855017662048e+00, -1.163959383964539e+00, -1.177134394645691e+00, -1.189932107925415e+00, -1.202832698822021e+00, -1.216340899467468e+00, -1.231044054031372e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.24743664264679e+00, -1.201852440834045e+00, -1.154999852180481e+00, -1.106710314750671e+00, -1.056821823120117e+00, -1.005141377449036e+00, -9.514356851577759e-01, -8.954179286956787e-01, -8.367290496826172e-01, -7.749086022377014e-01, -7.093496918678284e-01, -6.392230987548828e-01, -5.627924799919128e-01, -4.695020616054535e-01, -3.564305305480957e-01, -2.295256555080414e-01, -9.370908886194229e-02, 4.74429577589035e-02, 1.904758810997009e-01, 3.304909765720367e-01, 4.590849876403809e-01, 4.590849876403809e-01, 4.590849876403809e-01, 4.590849876403809e-01, 4.590849876403809e-01, 4.590849876403809e-01, 4.590849876403809e-01, 4.590849876403809e-01, 4.590849876403809e-01, 4.590849876403809e-01, 4.590849876403809e-01]
+spl.port_1.m_flow=[-8.281822800636292e-01, -8.281822800636292e-01, -8.281822800636292e-01, -8.281822800636292e-01, -8.281822800636292e-01, -8.281822800636292e-01, -8.281822800636292e-01, -8.281822800636292e-01, -8.281822800636292e-01, -8.281822800636292e-01, -8.281822800636292e-01, -8.281822800636292e-01, -8.281822800636292e-01, -8.281822800636292e-01, -8.281822800636292e-01, -8.281822800636292e-01, -8.281822800636292e-01, -8.281822800636292e-01, -8.281822800636292e-01, -8.281822800636292e-01, -8.281822800636292e-01, -7.027950882911682e-01, -5.806662440299988e-01, -4.475028812885284e-01, -3.028823733329773e-01, -1.533549875020981e-01, 0e+00, 1.578821390867233e-01, 3.211003839969641e-01, 4.874140322208398e-01, 6.539120674133301e-01, 8.175599575042725e-01, 9.704532623291016e-01, 1.110630631446838e+00, 1.239191651344299e+00, 1.357594966888428e+00, 1.467032551765442e+00, 1.568305134773254e+00, 1.661789655685425e+00, 1.747452974319458e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.82529604434967e+00, 1.807388305664062e+00, 1.788274645805359e+00, 1.767930150032043e+00, 1.746248126029968e+00, 1.723099589347839e+00, 1.698325753211975e+00, 1.671729683876038e+00, 1.643062233924866e+00, 1.612001776695251e+00, 1.578122019767761e+00, 1.54083788394928e+00, 1.499004483222961e+00, 1.446292281150818e+00, 1.380030751228333e+00, 1.302637100219727e+00, 1.216328024864197e+00, 1.122855305671692e+00, 1.02422022819519e+00, 9.238148331642151e-01, 8.281822800636292e-01, 8.281822800636292e-01, 8.281822800636292e-01, 8.281822800636292e-01, 8.281822800636292e-01, 8.281822800636292e-01, 8.281822800636292e-01, 8.281822800636292e-01, 8.281822800636292e-01, 8.281822800636292e-01, 8.281822800636292e-01]
+time=[0e+00, 1e+02]
+spl.port_1.p=[1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.013205e+05, 1.01321e+05, 1.013215e+05, 1.01322e+05, 1.013225e+05, 1.01323e+05, 1.013235e+05, 1.01324e+05, 1.013245e+05, 1.01325e+05, 1.013255e+05, 1.01326e+05, 1.013265e+05, 1.01327e+05, 1.013275e+05, 1.01328e+05, 1.013285e+05, 1.01329e+05, 1.013295e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05]
+spl.port_3.p=[1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.0132e+05, 1.013205e+05, 1.01321e+05, 1.013215e+05, 1.01322e+05, 1.013225e+05, 1.01323e+05, 1.013235e+05, 1.01324e+05, 1.013245e+05, 1.01325e+05, 1.013255e+05, 1.01326e+05, 1.013265e+05, 1.01327e+05, 1.013275e+05, 1.01328e+05, 1.013285e+05, 1.01329e+05, 1.013295e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05, 1.0133e+05]
+spl.port_2.p=[1.01325e+05, 1.01325e+05]
+spl.res3.dp=[-8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -1.117401242256165e+00, -1.421659469604492e+00, -1.775774598121643e+00, -2.171021461486816e+00, -2.58290433883667e+00, -3e+00, -3.41457724571228e+00, -3.817240953445436e+00, -4.188116073608398e+00, -4.465498924255371e+00, -4.664494514465332e+00, -4.822775840759277e+00, -4.95812463760376e+00, -5.080504894256592e+00, -5.196169853210449e+00, -5.309769630432129e+00, -5.42552375793457e+00, -5.548069000244141e+00, -5.683010101318359e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.835368156433105e+00, -5.416684150695801e+00, -5.00259256362915e+00, -4.593029022216797e+00, -4.188271522521973e+00, -3.788659811019897e+00, -3.394612073898315e+00, -3.006649732589722e+00, -2.625432968139648e+00, -2.251812696456909e+00, -1.886913537979126e+00, -1.532273173332214e+00, -1.191232085227966e+00, -8.852981328964233e-01, -6.193937659263611e-01, -3.789206147193909e-01, -1.506828516721725e-01, 7.600501179695129e-02, 3.112837076187134e-01, 5.667923092842102e-01, 8.57357382774353e-01, 8.57357382774353e-01, 8.57357382774353e-01, 8.57357382774353e-01, 8.57357382774353e-01, 8.57357382774353e-01, 8.57357382774353e-01, 8.57357382774353e-01, 8.57357382774353e-01, 8.57357382774353e-01, 8.57357382774353e-01]
+spl.res2.dp=[4.142642498016357e+00, 4.142642498016357e+00, 4.142642498016357e+00, 4.142642498016357e+00, 4.142642498016357e+00, 4.142642498016357e+00, 4.142642498016357e+00, 4.142642498016357e+00, 4.142642498016357e+00, 4.142642498016357e+00, 4.142642498016357e+00, 4.142642498016357e+00, 4.142642498016357e+00, 4.142642498016357e+00, 4.142642498016357e+00, 4.142642498016357e+00, 4.142642498016357e+00, 4.142642498016357e+00, 4.142642498016357e+00, 4.142642498016357e+00, 4.142642498016357e+00, 3.882598876953125e+00, 3.578340530395508e+00, 3.224225282669067e+00, 2.828978538513184e+00, 2.41709566116333e+00, 2e+00, 1.58542275428772e+00, 1.182758927345275e+00, 8.118839859962476e-01, 5.345012545585632e-01, 3.355053961277008e-01, 1.772243529558182e-01, 4.187554866075516e-02, -8.050493896007538e-02, -1.961700320243835e-01, -3.09769481420517e-01, -4.255239069461823e-01, -5.480689406394958e-01, -6.830101609230042e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -8.353681564331055e-01, -9.166843891143799e-01, -1.002592325210571e+00, -1.093029022216797e+00, -1.188271641731262e+00, -1.288659811019897e+00, -1.394611954689026e+00, -1.506649851799011e+00, -1.625433087348938e+00, -1.75181257724762e+00, -1.886913537979126e+00, -2.032273054122925e+00, -2.191231966018677e+00, -2.385298013687134e+00, -2.619393825531006e+00, -2.878920555114746e+00, -3.150682926177979e+00, -3.423995018005371e+00, -3.688716411590576e+00, -3.933207750320435e+00, -4.142642498016357e+00, -4.142642498016357e+00, -4.142642498016357e+00, -4.142642498016357e+00, -4.142642498016357e+00, -4.142642498016357e+00, -4.142642498016357e+00, -4.142642498016357e+00, -4.142642498016357e+00, -4.142642498016357e+00, -4.142642498016357e+00]
+spl.res1.dp=[-8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -8.57357382774353e-01, -6.174011826515198e-01, -4.216594398021698e-01, -2.757746577262878e-01, -1.710215359926224e-01, -8.290426433086395e-02, 0e+00, 8.542276173830032e-02, 1.827589571475987e-01, 3.118839859962458e-01, 5.345012545585632e-01, 8.355054259300232e-01, 1.177224397659302e+00, 1.541875600814819e+00, 1.919495105743408e+00, 2.303829908370972e+00, 2.69023060798645e+00, 3.074476003646851e+00, 3.451930999755859e+00, 3.816989898681641e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.164631843566895e+00, 4.083315849304199e+00, 3.997407674789429e+00, 3.906970977783203e+00, 3.811728477478027e+00, 3.711340188980103e+00, 3.605387926101685e+00, 3.493350267410278e+00, 3.374567031860352e+00, 3.248187303543091e+00, 3.113086462020874e+00, 2.967726945877075e+00, 2.808768033981323e+00, 2.614701986312866e+00, 2.380606174468994e+00, 2.121079444885254e+00, 1.849317193031311e+00, 1.576004981994629e+00, 1.311283707618713e+00, 1.066792368888855e+00, 8.57357382774353e-01, 8.57357382774353e-01, 8.57357382774353e-01, 8.57357382774353e-01, 8.57357382774353e-01, 8.57357382774353e-01, 8.57357382774353e-01, 8.57357382774353e-01, 8.57357382774353e-01, 8.57357382774353e-01, 8.57357382774353e-01]
+senTem2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.930244750976562e+02, 2.924097595214844e+02, 2.914061279296875e+02, 2.901784362792969e+02, 2.888866271972656e+02, 2.876587829589844e+02, 2.86578369140625e+02, 2.85717529296875e+02, 2.850731201171875e+02, 2.845906677246094e+02, 2.842291564941406e+02, 2.83958251953125e+02, 2.837553405761719e+02, 2.836033630371094e+02, 2.834895629882812e+02, 2.83404296875e+02, 2.833404846191406e+02, 2.832926940917969e+02, 2.832569274902344e+02, 2.832301940917969e+02, 2.832101440429688e+02, 2.83195068359375e+02, 2.831837768554688e+02, 2.8317529296875e+02, 2.831689758300781e+02, 2.831642150878906e+02, 2.831606750488281e+02, 2.831579895019531e+02, 2.831559753417969e+02, 2.831544799804688e+02, 2.831533813476562e+02, 2.831525268554688e+02, 2.831519470214844e+02, 2.831514892578125e+02, 2.831511535644531e+02, 2.831509094238281e+02, 2.831506958007812e+02, 2.831505126953125e+02, 2.831503601074219e+02, 2.831502685546875e+02, 2.831501770019531e+02, 2.831501159667969e+02, 2.831500549316406e+02, 2.831500244140625e+02, 2.831500244140625e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.832241821289062e+02, 2.841381530761719e+02, 2.856805419921875e+02, 2.874681091308594e+02, 2.888042297363281e+02, 2.895059814453125e+02, 2.898748168945312e+02, 2.900684814453125e+02, 2.901701049804688e+02, 2.902235107421875e+02, 2.902515869140625e+02, 2.902663269042969e+02, 2.902741088867188e+02, 2.902781677246094e+02]
+senTem3.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931498413085938e+02, 2.929136352539062e+02, 2.922884826660156e+02, 2.913876953125e+02, 2.903067932128906e+02, 2.891159362792969e+02, 2.878775024414062e+02, 2.866484069824219e+02, 2.85544189453125e+02, 2.84770751953125e+02, 2.842425231933594e+02, 2.838832397460938e+02, 2.836399230957031e+02, 2.83475830078125e+02, 2.833656005859375e+02, 2.832921447753906e+02, 2.832437744140625e+02, 2.832119140625e+02, 2.831908569335938e+02, 2.831769104003906e+02, 2.831677551269531e+02, 2.831616821289062e+02, 2.8315771484375e+02, 2.831550903320312e+02, 2.831533508300781e+02, 2.831522216796875e+02, 2.831514587402344e+02, 2.831509704589844e+02, 2.831506652832031e+02, 2.831504516601562e+02, 2.831502990722656e+02, 2.831501770019531e+02, 2.831501159667969e+02, 2.831500854492188e+02, 2.831500549316406e+02, 2.831500244140625e+02, 2.831500244140625e+02, 2.831500244140625e+02, 2.831500244140625e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.832029418945312e+02, 2.839783325195312e+02, 2.855758056640625e+02, 2.877502746582031e+02, 2.899354553222656e+02, 2.91810546875e+02, 2.934195556640625e+02, 2.948002319335938e+02, 2.959850158691406e+02, 2.97001708984375e+02, 2.978741149902344e+02, 2.986227416992188e+02, 2.9926513671875e+02, 2.998163757324219e+02]
+senTem1.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931495361328125e+02, 2.923948364257812e+02, 2.904292297363281e+02, 2.880081481933594e+02, 2.858947448730469e+02, 2.844644775390625e+02, 2.836870727539062e+02, 2.833395080566406e+02, 2.8320849609375e+02, 2.831660461425781e+02, 2.831539916992188e+02, 2.8315087890625e+02, 2.831501770019531e+02, 2.831500244140625e+02, 2.831500244140625e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_FlowJunctionSteadyStateNoPressureDrop.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_FlowJunctionSteadyStateNoPressureDrop.txt
new file mode 100644
index 00000000..a23d9e75
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_FlowJunctionSteadyStateNoPressureDrop.txt
@@ -0,0 +1,21 @@
+last-generated=2017-03-31
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "3",
+ "linear": " "
+}
+spl.port_2.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -5.000000074505806e-02, -1.000000014901161e-01, -1.500000059604645e-01, -2.000000029802322e-01, -2.5e-01, -3.00000011920929e-01, -3.499999940395355e-01, -4.000000059604646e-01, -4.499999880790709e-01, -5e-01, -5.50000011920929e-01, -6.000000238418579e-01, -6.499999761581421e-01, -6.99999988079071e-01, -7.5e-01, -8.00000011920929e-01, -8.500000238418579e-01, -8.999999761581421e-01, -9.49999988079071e-01, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1.049999952316284e+00, -1.100000023841858e+00, -1.149999976158142e+00, -1.200000047683716e+00, -1.25e+00, -1.299999952316284e+00, -1.350000023841858e+00, -1.399999976158142e+00, -1.450000047683716e+00, -1.5e+00, -1.549999952316284e+00, -1.600000023841858e+00, -1.649999976158142e+00, -1.700000047683716e+00, -1.75e+00, -1.799999952316284e+00, -1.850000023841858e+00, -1.899999976158142e+00, -1.950000047683716e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00]
+spl.port_3.m_flow=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.049999952316284e+00, 1.100000023841858e+00, 1.149999976158142e+00, 1.200000047683716e+00, 1.25e+00, 1.299999952316284e+00, 1.350000023841858e+00, 1.399999976158142e+00, 1.450000047683716e+00, 1.5e+00, 1.549999952316284e+00, 1.600000023841858e+00, 1.649999976158142e+00, 1.700000047683716e+00, 1.75e+00, 1.799999952316284e+00, 1.850000023841858e+00, 1.899999976158142e+00, 1.950000047683716e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00]
+spl.port_1.m_flow=[-1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -9.49999988079071e-01, -8.999999761581421e-01, -8.500000238418579e-01, -8.00000011920929e-01, -7.5e-01, -6.99999988079071e-01, -6.499999761581421e-01, -6.000000238418577e-01, -5.500000119209292e-01, -5e-01, -4.49999988079071e-01, -4.000000059604645e-01, -3.499999940395355e-01, -3.00000011920929e-01, -2.5e-01, -2.000000029802322e-01, -1.500000059604645e-01, -1.000000014901161e-01, -5.000000074505806e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+time=[0e+00, 1e+02]
+spl.port_1.p=[1.01325e+05, 1.01325e+05]
+spl.port_3.p=[1.01325e+05, 1.01325e+05]
+spl.port_2.p=[1.01325e+05, 1.01325e+05]
+spl.res3.dp=[0e+00, 0e+00]
+spl.res2.dp=[0e+00, 0e+00]
+spl.res1.dp=[0e+00, 0e+00]
+senTem2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.932738952636719e+02, 2.93636474609375e+02, 2.942121276855469e+02, 2.949601135253906e+02, 2.958314208984375e+02, 2.967716979980469e+02, 2.977285766601562e+02, 2.986557922363281e+02, 2.995165405273438e+02, 3.002850646972656e+02, 3.009468383789062e+02, 3.01497314453125e+02, 3.019408264160156e+02, 3.022871704101562e+02, 3.025495300292969e+02, 3.027424011230469e+02, 3.028802490234375e+02, 3.029759216308594e+02, 3.030404357910156e+02, 3.030827331542969e+02, 3.031093444824219e+02, 3.031255493164062e+02, 3.031351623535156e+02, 3.031409912109375e+02, 3.031445922851562e+02, 3.031468200683594e+02, 3.031481018066406e+02, 3.031488342285156e+02, 3.031492614746094e+02, 3.031495056152344e+02, 3.031496887207031e+02, 3.031498107910156e+02, 3.0314990234375e+02, 3.031499328613281e+02, 3.031499633789062e+02, 3.031499938964844e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
+senTem3.T=[2.931499938964844e+02, 2.959846801757812e+02, 2.980158386230469e+02, 2.9947119140625e+02, 3.005140380859375e+02, 3.0126123046875e+02, 3.01796630859375e+02, 3.021802673339844e+02, 3.024551391601562e+02, 3.02652099609375e+02, 3.027932739257812e+02, 3.028944702148438e+02, 3.029669189453125e+02, 3.030188598632812e+02, 3.030560302734375e+02, 3.030826416015625e+02, 3.031016845703125e+02, 3.031153259277344e+02, 3.031251220703125e+02, 3.031321411132812e+02, 3.0313720703125e+02, 3.031408386230469e+02, 3.031434631347656e+02, 3.031453247070312e+02, 3.031466369628906e+02, 3.031475830078125e+02, 3.031482849121094e+02, 3.031487731933594e+02, 3.031491088867188e+02, 3.031493530273438e+02, 3.031495361328125e+02, 3.03149658203125e+02, 3.031497802734375e+02, 3.031498413085938e+02, 3.031498718261719e+02, 3.0314990234375e+02, 3.031499328613281e+02, 3.031499633789062e+02, 3.031499633789062e+02, 3.031499633789062e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
+senTem1.T=[2.931499938964844e+02, 2.994708557128906e+02, 3.017966918945312e+02, 3.026517944335938e+02, 3.029666442871094e+02, 3.030824890136719e+02, 3.031249389648438e+02, 3.031405944824219e+02, 3.031465148925781e+02, 3.031485595703125e+02, 3.031494445800781e+02, 3.031498413085938e+02, 3.031499328613281e+02, 3.031499633789062e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499633789062e+02, 3.031499633789062e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_LosslessPipe.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_LosslessPipe.txt
new file mode 100644
index 00000000..821316b4
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_LosslessPipe.txt
@@ -0,0 +1,11 @@
+last-generated=2016-12-02
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+res.dp=[0., 0.]
+time=[0., 1.]
+res.sta_a.T=[283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375]
+res.sta_b.T=[283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_PressureDropsExplicit.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_PressureDropsExplicit.txt
new file mode 100644
index 00000000..6da1aea3
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_PressureDropsExplicit.txt
@@ -0,0 +1,17 @@
+last-generated=2017-05-01
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 1, 1, 0, 1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "0, 0, 1",
+ "linear": " "
+}
+res21.m_flow=[-2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -1.959591745415846e+00, -1.91833257488339e+00, -1.87616634082318e+00, -1.833030219935111e+00, -1.788854363904185e+00, -1.743559592753025e+00, -1.697056294888564e+00, -1.649242273214387e+00, -1.600000041667563e+00, -1.549193389932589e+00, -1.496662971160134e+00, -1.442220553721059e+00, -1.385640593539562e+00, -1.326649907829207e+00, -1.264911093075421e+00, -1.20000002370785e+00, -1.131370914627385e+00, -1.05830054883521e+00, -9.797958535334435e-01, -8.944272066848777e-01, -7.999999455152141e-01, -6.92820296590192e-01, -5.649875992881604e-01, -3.469959632448059e-01, 2.952992541046064e-15, 3.469963948688536e-01, 5.649873682217298e-01, 6.92820296590192e-01, 8.000000943495461e-01, 8.944270725782018e-01, 9.797958535334435e-01, 1.05830054883521e+00, 1.131370808751474e+00, 1.20000002370785e+00, 1.264911093075421e+00, 1.326649817592914e+00, 1.385640593539562e+00, 1.442220595006066e+00, 1.496663050550369e+00, 1.549193351380217e+00, 1.600000041667563e+00, 1.649242345334755e+00, 1.697056259675731e+00, 1.743559609833375e+00, 1.788854413760197e+00, 1.833030187340813e+00, 1.876166348760524e+00, 1.918332621397505e+00, 1.959591707315291e+00, 2e+00]
+res11.m_flow=[-2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -1.959591745415846e+00, -1.91833257488339e+00, -1.87616634082318e+00, -1.833030219935111e+00, -1.788854363904185e+00, -1.743559592753025e+00, -1.697056294888564e+00, -1.649242273214387e+00, -1.600000041667563e+00, -1.549193389932589e+00, -1.496662971160134e+00, -1.442220553721059e+00, -1.385640593539562e+00, -1.326649907829207e+00, -1.264911093075421e+00, -1.20000002370785e+00, -1.131370914627385e+00, -1.05830054883521e+00, -9.797958535334435e-01, -8.944272066848777e-01, -7.999999455152141e-01, -6.92820296590192e-01, -5.649875992881604e-01, -3.469959632448059e-01, 0e+00, 3.469963948688536e-01, 5.649873682217298e-01, 6.92820296590192e-01, 8.000000943495461e-01, 8.944270725782018e-01, 9.797958535334435e-01, 1.05830054883521e+00, 1.131370808751474e+00, 1.20000002370785e+00, 1.264911093075421e+00, 1.326649817592914e+00, 1.385640593539562e+00, 1.442220595006066e+00, 1.496663050550369e+00, 1.549193351380217e+00, 1.600000041667563e+00, 1.649242345334755e+00, 1.697056259675731e+00, 1.743559609833375e+00, 1.788854413760197e+00, 1.833030187340813e+00, 1.876166348760524e+00, 1.918332621397505e+00, 1.959591707315291e+00, 2e+00]
+time=[-1e+00, 1e+00]
+res31.dp=[1.25e+00, 1.25e+00]
+res41.dp=[1.25e+00, 1.25e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_PressureDropsExplicitLinearized.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_PressureDropsExplicitLinearized.txt
new file mode 100644
index 00000000..87121a84
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_PressureDropsExplicitLinearized.txt
@@ -0,0 +1,12 @@
+last-generated=2016-12-02
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": "0, 0"
+}
+res21.m_flow=[-2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -1.91999995529652633941, -1.84000002980231558425, -1.75999998509883370801, -1.67999994039539490842, -1.60000002980233313465, -1.51999997019765720196, -1.4400000596046362844, -1.36000000000000031974, -1.28000000000000024869, -1.20000005960455613518, -1.12000000000000010658, -1.03999994039551513225, -0.95999994039549729763, -0.87999999999999989342, -0.80000005960446696207, -0.71999999999999975131, -0.63999999999999968026, -0.56000005960443122177, -0.47999997019771356577, -0.40000002980227833405, -0.31999994039545320845, -0.23999998509886566467, -0.16000002980226035731, -0.07999995529661640958, 0., 0.08000007450566393175, 0.15999991059319285114, 0.23999998509886566467, 0.32000005960452071463, 0.39999991059321082787, 0.47999997019771356577, 0.56000005960443122177, 0.63999988079110092798, 0.71999999999999975131, 0.80000005960446696207, 0.87999988079113666828, 0.95999994039549729763, 1.04000000000000003553, 1.12000011920928965736, 1.20000000000000017764, 1.28000000000000024869, 1.36000011920928987053, 1.4400000000000003908, 1.51999999999999957367, 1.60000011920928919551, 1.67999988079120754492, 1.75999999999999978684, 1.84000011920864992021, 1.91999988079127881235, 2.]
+res11.m_flow=[-2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -2., -1.91999995529652633941, -1.84000002980231558425, -1.75999998509883370801, -1.67999994039539490842, -1.60000002980233313465, -1.51999997019765720196, -1.4400000596046362844, -1.36000000000000031974, -1.28000000000000024869, -1.20000005960455613518, -1.12000000000000010658, -1.03999994039551513225, -0.95999994039549729763, -0.87999999999999989342, -0.80000005960446696207, -0.71999999999999975131, -0.63999999999999968026, -0.56000005960443122177, -0.47999997019771356577, -0.40000002980227833405, -0.31999994039545320845, -0.23999998509886566467, -0.16000002980226035731, -0.07999995529661640958, 0., 0.08000007450566393175, 0.15999991059319285114, 0.23999998509886566467, 0.32000005960452071463, 0.39999991059321082787, 0.47999997019771356577, 0.56000005960443122177, 0.63999988079110092798, 0.71999999999999975131, 0.80000005960446696207, 0.87999988079113666828, 0.95999994039549729763, 1.04000000000000003553, 1.12000011920928965736, 1.20000000000000017764, 1.28000000000000024869, 1.36000011920928987053, 1.4400000000000003908, 1.51999999999999957367, 1.60000011920928919551, 1.67999988079120754492, 1.75999999999999978684, 1.84000011920864992021, 1.91999988079127881235, 2.]
+time=[-1., 1.]
+res31.dp=[2.5, 2.5]
+res41.dp=[2.5, 2.5]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_PressureDropsParallel.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_PressureDropsParallel.txt
new file mode 100644
index 00000000..99129a8e
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_PressureDropsParallel.txt
@@ -0,0 +1,10 @@
+last-generated=2017-05-01
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+res1.m_flow=[-5e+00, -4.949747561278365e+00, -4.898979661565157e+00, -4.847680088396043e+00, -4.795831675632145e+00, -4.74341631327924e+00, -4.690415852066217e+00, -4.636809350665035e+00, -4.582575788267993e+00, -4.527692814522442e+00, -4.472136028979773e+00, -4.415880199868305e+00, -4.358899101112146e+00, -4.301162691973388e+00, -4.242640498807667e+00, -4.183300053880244e+00, -4.123105504254328e+00, -4.062019359133052e+00, -4.000000044634499e+00, -3.937003835772801e+00, -3.87298347486318e+00, -3.807886557374547e+00, -3.741657487519278e+00, -3.674234657014039e+00, -3.605551205560976e+00, -3.535533905029297e+00, -3.46410148399414e+00, -3.391165097004613e+00, -3.316624888802362e+00, -3.24037020905617e+00, -3.162277792525722e+00, -3.082206983780583e+00, -2.999999940229266e+00, -2.915475957452088e+00, -2.828427107851518e+00, -2.73861283564909e+00, -2.645751372560608e+00, -2.54950981029676e+00, -2.44948978305284e+00, -2.345207776419071e+00, -2.236068076640045e+00, -2.121320205266643e+00, -1.999999835049757e+00, -1.870828842656045e+00, -1.732050741777371e+00, -1.581138658848987e+00, -1.41246906157267e+00, -1.1871142053521e+00, -8.674899470438956e-01, -4.596181795506984e-01, 0e+00, 4.596181795445027e-01, 8.674910350955741e-01, 1.187114983977726e+00, 1.41246849551348e+00, 1.581138658851825e+00, 1.732050741776854e+00, 1.87082884265463e+00, 2.000000207324334e+00, 2.121320555025162e+00, 2.23606774242886e+00, 2.345207776421354e+00, 2.449489783053568e+00, 2.549509810296066e+00, 2.645751372558601e+00, 2.738613107162871e+00, 2.828426843809169e+00, 2.915475701807438e+00, 2.999999940230157e+00, 3.08220698378087e+00, 3.162277792524321e+00, 3.24037043874414e+00, 3.316624663690184e+00, 3.391164877164667e+00, 3.464101483995167e+00, 3.535533905029297e+00, 3.605551308825872e+00, 3.674234758214506e+00, 3.741657686315374e+00, 3.807886459377018e+00, 3.872983378581009e+00, 3.937003835772576e+00, 4.000000044633834e+00, 4.062019450702533e+00, 4.123105684757019e+00, 4.183299875630296e+00, 4.242640410892656e+00, 4.301162691973802e+00, 4.358899143827776e+00, 4.415880284131613e+00, 4.472136153768381e+00, 4.527692649812887e+00, 4.5825757068804e+00, 4.636809310450957e+00, 4.690415871915711e+00, 4.743416372116446e+00, 4.795831792027384e+00, 4.847679944153923e+00, 4.898979566411811e+00, 4.949747514192402e+00, 5e+00]
+res2.m_flow=[-5e+00, -4.949747561278365e+00, -4.898979661565157e+00, -4.847680088396043e+00, -4.795831675632145e+00, -4.74341631327924e+00, -4.690415852066217e+00, -4.636809350665035e+00, -4.582575788267993e+00, -4.527692814522442e+00, -4.472136028979773e+00, -4.415880199868305e+00, -4.358899101112146e+00, -4.301162691973388e+00, -4.242640498807667e+00, -4.183300053880244e+00, -4.123105504254328e+00, -4.062019359133052e+00, -4.000000044634499e+00, -3.937003835772801e+00, -3.87298347486318e+00, -3.807886557374547e+00, -3.741657487519278e+00, -3.674234657014039e+00, -3.605551205560976e+00, -3.535533905029297e+00, -3.46410148399414e+00, -3.391165097004613e+00, -3.316624888802362e+00, -3.24037020905617e+00, -3.162277792525722e+00, -3.082206983780583e+00, -2.999999940229266e+00, -2.915475957452088e+00, -2.828427107851518e+00, -2.73861283564909e+00, -2.645751372560608e+00, -2.54950981029676e+00, -2.44948978305284e+00, -2.345207776419071e+00, -2.236068076640045e+00, -2.121320205266643e+00, -1.999999835049757e+00, -1.870828842656045e+00, -1.732050741777371e+00, -1.581138658848987e+00, -1.41246906157267e+00, -1.1871142053521e+00, -8.674899470438956e-01, -4.596181795506984e-01, 0e+00, 4.596181795445027e-01, 8.674910350955741e-01, 1.187114983977726e+00, 1.41246849551348e+00, 1.581138658851825e+00, 1.732050741776854e+00, 1.87082884265463e+00, 2.000000207324334e+00, 2.121320555025162e+00, 2.23606774242886e+00, 2.345207776421354e+00, 2.449489783053568e+00, 2.549509810296066e+00, 2.645751372558601e+00, 2.738613107162871e+00, 2.828426843809169e+00, 2.915475701807438e+00, 2.999999940230157e+00, 3.08220698378087e+00, 3.162277792524321e+00, 3.24037043874414e+00, 3.316624663690184e+00, 3.391164877164667e+00, 3.464101483995167e+00, 3.535533905029297e+00, 3.605551308825872e+00, 3.674234758214506e+00, 3.741657686315374e+00, 3.807886459377018e+00, 3.872983378581009e+00, 3.937003835772576e+00, 4.000000044633834e+00, 4.062019450702533e+00, 4.123105684757019e+00, 4.183299875630296e+00, 4.242640410892656e+00, 4.301162691973802e+00, 4.358899143827776e+00, 4.415880284131613e+00, 4.472136153768381e+00, 4.527692649812887e+00, 4.5825757068804e+00, 4.636809310450957e+00, 4.690415871915711e+00, 4.743416372116446e+00, 4.795831792027384e+00, 4.847679944153923e+00, 4.898979566411811e+00, 4.949747514192402e+00, 5e+00]
+time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_PressureDropsSeries.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_PressureDropsSeries.txt
new file mode 100644
index 00000000..99157d73
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_FixedResistances_Validation_PressureDropsSeries.txt
@@ -0,0 +1,15 @@
+last-generated=2017-05-01
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "0, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "0, 0",
+ "linear": " "
+}
+res[1].m_flow_turbulent=[6.000000238418579e-01, 6.000000238418579e-01]
+res[1].m_flow=[-2e+00, -1.979898929143922e+00, -1.959591745416805e+00, -1.939071892307326e+00, -1.918332574885415e+00, -1.897366644520932e+00, -1.876166340826455e+00, -1.854723692582302e+00, -1.833030219939809e+00, -1.811077006599772e+00, -1.788854363908265e+00, -1.766352175314739e+00, -1.743559592761111e+00, -1.720465052947554e+00, -1.697056294890477e+00, -1.673320069235813e+00, -1.649242273227177e+00, -1.624807719811363e+00, -1.600000041695487e+00, -1.574801558151007e+00, -1.549193389945201e+00, -1.523154599108039e+00, -1.496662971165853e+00, -1.469693910489182e+00, -1.442220553749836e+00, -1.414213538169861e+00, -1.385640593597542e+00, -1.356466086485305e+00, -1.326649907837272e+00, -1.296148155147644e+00, -1.264911093168147e+00, -1.23288286503775e+00, -1.200000023774996e+00, -1.166190430664082e+00, -1.131370914666181e+00, -1.095445134259636e+00, -1.058300549024073e+00, -1.019803900277017e+00, -9.797958536165764e-01, -9.380831105675431e-01, -8.944272068141957e-01, -8.485281297903303e-01, -7.99999945940988e-01, -7.483315251415318e-01, -6.928202967109481e-01, -6.324554516188081e-01, -5.649876007875088e-01, -4.748456642594643e-01, -3.469959668965973e-01, -1.838472658598717e-01, 0e+00, 1.838472658573934e-01, 3.469964021174144e-01, 4.748459757101235e-01, 5.649873743639179e-01, 6.324554516199433e-01, 6.928202967107416e-01, 7.483315251409659e-01, 8.000000948506625e-01, 8.485282696931553e-01, 8.944270731294017e-01, 9.380831105684562e-01, 9.797958536168676e-01, 1.019803900276739e+00, 1.05830054902327e+00, 1.095445242866001e+00, 1.131370809048303e+00, 1.166190328405895e+00, 1.200000023775352e+00, 1.232882865037865e+00, 1.264911093167586e+00, 1.296148247023486e+00, 1.326649817792017e+00, 1.356465998549128e+00, 1.385640593597953e+00, 1.414213538169861e+00, 1.442220595055695e+00, 1.469693950968836e+00, 1.496663050683951e+00, 1.523154559909205e+00, 1.549193351432546e+00, 1.574801558150917e+00, 1.600000041695221e+00, 1.624807756439155e+00, 1.649242345426818e+00, 1.673319997933845e+00, 1.69705625972313e+00, 1.720465052947719e+00, 1.743559609847565e+00, 1.766352209018712e+00, 1.788854413824774e+00, 1.811076940717116e+00, 1.833030187385126e+00, 1.854723676496923e+00, 1.876166348766284e+00, 1.897366668055015e+00, 1.918332621444801e+00, 1.939071834612809e+00, 1.959591707356799e+00, 1.97989891030987e+00, 2e+00]
+time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_BaseClasses_Examples_Convector.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_BaseClasses_Examples_Convector.txt
new file mode 100644
index 00000000..76432eb5
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_BaseClasses_Examples_Convector.txt
@@ -0,0 +1,13 @@
+last-generated=2016-06-13
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "2",
+ "linear": " "
+}
+con.TRoo=[298.149993896484375, 298.149993896484375]
+time=[0., 10.]
+con.mAir_flow=[0., 0.00197999991320074167, 0.00395999982640146166, 0.00593999982491135066, 0.00791999965280308117, 0.0098999999463558197, 0.01187999964982340388, 0.01386000053346067053, 0.01583999930560679031, 0.01782000112056662811, 0.0197999998927116394, 0.02177999866485746602, 0.02375999929964962148, 0.02574000043212947703, 0.02772000106692385987, 0.02969999983906745911, 0.03167999861121328226, 0.03365999738336473979, 0.03564000224112599813, 0.03762000101327745566, 0.03959999978542327881, 0.04158000091792327102, 0.04355999732971493205, 0.04554000218748745915, 0.0475199985992791063, 0.04949999973177909851, 0.05148000086427909072, 0.05345999727607075175, 0.05544000213384327885, 0.057419998545634926, 0.05939999967813491821, 0.06138000081063491042, 0.06335999722242656451, 0.06533999835492655672, 0.06731999476671822469, 0.06930000334978103638, 0.07128000448226325114, 0.07326000089407268268, 0.07524000202655491132, 0.07721999843836434285, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762, 0.07919999957084655762]
+con.port_a.m_flow=[0.09399999678134918213, 0.09399999678134918213]
+con.Q_flow=[-0., -71.04931531797610944068, -146.09765398287481730222, -222.7455963239766560946, -298.59374553249165273883, -371.24267578125, -438.29295343523165229271, -497.34522118538910717689, -545.99999476434072676057, -587.08167439170495072176, -625.114013671875, -660.24706220409234447288, -692.6308444405897262186, -722.41529669311944417132, -749.7502503231576156395, -774.7857666015625, -797.67186973991420018137, -818.55846208434820709954, -837.59546756414124502044, -854.93286523429935641616, -870.720703125, -885.10889970227219691878, -898.24730840941788301279, -910.28601619959749768896, -921.37498975282255742059, -931.6641845703125, -941.30347568082777343079, -950.44286681402763861115, -959.23242599756156323565, -967.82195229955641480046, -976.361572265625, -985.00110699231368016626, -993.89062069626697848435, -1003.18005828620960073749, -1013.01927748181878996547, -1023.558349609375, -1034.94727703545868280344, -1047.33593138469723271555, -1060.87427439424845942995, -1075.71226559286947122018, -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_BaseClasses_Examples_DerivateCubicSpline.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_BaseClasses_Examples_DerivateCubicSpline.txt
new file mode 100644
index 00000000..4c002c3d
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_BaseClasses_Examples_DerivateCubicSpline.txt
@@ -0,0 +1,9 @@
+last-generated=2016-06-13
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+cubSpl.y=[0., 0.01509800028531359251, 0.03038400107891164881, 0.04584600135729296339, 0.06147200009695773931, 0.07724999518424954803, 0.09316800004199984886, 0.10921399992423172498, 0.12537600390189085342, 0.14164199842044961075, 0.1580000048291810566, 0.17443800070766513066, 0.19094400551536760968, 0.20750600890648304708, 0.22411200305099956975, 0.24074998995785945599, 0.25740799903798577963, 0.27407398521909059896, 0.29073597789475086328, 0.30738199153689199639, 0.32399999600533152533, 0.34057800066687105023, 0.35710400539510755991, 0.37356599479705437927, 0.38995201271865376214, 0.40625, 0.42244802463789893343, 0.43853397436808033705, 0.45449599434024212652, 0.47032202603496919835, 0.48599998281486239682, 0.50151800740930274625, 0.51686401264972581249, 0.53202597308893218031, 0.54699199859449632033, 0.56175000347366588205, 0.57628796418150252112, 0.59059398688778186326, 0.60465598769688788661, 0.61846204564149642735, 0.63200002108335184836, 0.645258014113193612, 0.65822400339128406266, 0.67088597116171344581, 0.68323201230787711236, 0.69524998881340127621, 0.7069280051262420983, 0.71825403107516638812, 0.72921599109711165987, 0.73980199295751591926, 0.75, 0.7598019929573799347, 0.76921601855547028226, 0.77825399775818415726, 0.78692797976026163109, 0.79524998881354669322, 0.80323201230784924132, 0.81088603076627863153, 0.81822402479062039671, 0.82525803456898327859, 0.83200000136393470473, 0.83846198603698707252, 0.84465598769693117642, 0.85059398688774068287, 0.85628802378560264774, 0.86175001937858819456, 0.86699198324061099719, 0.87202601798162293623, 0.87686401264956348456, 0.88151800740928343281, 0.88599998281496217256, 0.89032203866927073221, 0.8944960118740543642, 0.89853399231664432545, 0.90244799483577353705, 0.90625, 0.9099519883605446946, 0.91356600011135780104, 0.91710401582014466904, 0.92057799552389696363, 0.92400002073733611407, 0.92738199153688005705, 0.93073600769682440781, 0.9340739901865529049, 0.93740797917986040666, 0.94074999487892096983, 0.94411199802450695984, 0.94750600890654279596, 0.95094400809742340996, 0.95443797616911718595, 0.95800001289392966441, 0.96164201725806441878, 0.96537601317962895564, 0.96921401938253826103, 0.97316801644056549758, 0.97724998493696213497, 0.98147202463154281649, 0.98584597033264920185, 0.99038397387281607021, 0.99509799023908040994, 1.]
+time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_BaseClasses_Examples_ModificationFactor.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_BaseClasses_Examples_ModificationFactor.txt
new file mode 100644
index 00000000..75f93502
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_BaseClasses_Examples_ModificationFactor.txt
@@ -0,0 +1,13 @@
+last-generated=2016-06-14
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+mod.TWat=[20., 20.27799988414338372422, 20.55599976828719022137, 20.83399965243076934485, 21.11199953657438399546, 21.38999936893612030531, 21.66799930486157421683, 21.94599913722286999018, 22.22400098049560313029, 22.50200070929347262449, 22.78000064521953049734, 23.058000581145019936, 23.33600051706908473648, 23.61400045299315308966, 23.89200018179386830752, 24.16999991059571328833, 24.44800005364256989537, 24.72599978244384999471, 25.00399951124513009404, 25.28199965429426043784, 25.55999938309326680042, 25.83799952614637618353, 26.11599925494254037517, 26.39399898374268360612, 26.67200103413817302567, 26.950000762939453125, 27.22800090598630973204, 27.50600022053178150827, 27.78400036358773306233, 28.06200050663572653775, 28.33999982119143012937, 28.61799996423828673642, 28.89600010728514334346, 29.17399942184084693508, 29.45199956488770354213, 29.72999970794024093834, 30.00799902249026374079, 30.28599916553712034784, 30.56399930858852087567, 30.84199945164447242973, 31.12000067352948562416, 31.39800081658202302037, 31.67600095962887962742, 31.95400027417776200878, 32.23199850988735448709, 32.50999865295240454088, 32.78799796748536721225, 33.06600192522948589158, 33.34400206827634605133, 33.62200138281386330164, 33.90000152587890625, 34.17800166892180868672, 34.45600181196471822886, 34.73400195500762066558, 35.01200044109291553696, 35.2900005841358250791, 35.56800072717675220701, 35.84600087022162995254, 36.12400101326453949468, 36.4020011563074419314, 36.67999964239273680278, 36.95799978543563923949, 37.23599992847854878164, 37.51400007152145121836, 37.79200021456436076051, 38.07000035760726319722, 38.3479988436925580686, 38.62599898673546050532, 38.90399912977837004746, 39.18199927282324779299, 39.4599994158641749209, 39.73799955890708446304, 40.01599804499237933442, 40.29399818803528177114, 40.57199833107819131328, 40.84999847412109375, 41.12799861718218608075, 41.40599876024328551694, 41.68399890330437784769, 41.96200120399144140038, 42.24000134705254083656, 42.51800149011165785851, 42.79600163316108307754, 43.07400177620399261968, 43.3520019192468950564, 43.63000040533218992778, 43.90800054837509236449, 44.18600069141800190664, 44.46400083446090434336, 44.74200097750381388551, 45.02000112054671632222, 45.2979996066320111936, 45.57599974967491363032, 45.85399989271782317246, 46.13200003576270091799, 46.4100001788036280459, 46.68800032184653758804, 46.96599880793183245942, 47.24399895097473489614, 47.52199909401764443828, 47.799999237060546875]
+mod.TRoo=[20., 20.]
+time=[0., 1.]
+mod.mAir_flow=[0., 0.00079199999478459535, 0.00158399998956919069, 0.00237599998435373671, 0.00316799997913838139, 0.00395999982640155273, 0.00475199996870772842, 0.0055439998159706478, 0.00633599995827670726, 0.00712799951049776937, 0.00791999965280332577, 0.00871200026077002983, 0.00950399993741506133, 0.01029600054538238989, 0.01108799963194161131, 0.01187999964982284877, 0.01267199991655341453, 0.01346399993443493301, 0.01425599902099720408, 0.01504800021904701551, 0.01583999930560734543, 0.0166320005036560449, 0.01742400052154005965, 0.01821600053942018863, 0.01900799987483262066, 0.0197999998927116394, 0.02059200109076033888, 0.02138399992846968037, 0.02217599926388322262, 0.02296800046193191863, 0.02375999929965124866, 0.02455200049769772769, 0.02534399983311015972, 0.02613599867082283187, 0.02692799986887153135, 0.02772000106692022736, 0.02851199804199440815, 0.02930399924004310763, 0.03009600043809181058, 0.03088800163614051006, 0.03167999861121469085, 0.03247199980926338686, 0.03326400100731208981, 0.03405599984503141636, 0.03484800104308011931, 0.03564000224112881532, 0.03643200107883260569, 0.0372239985516087668, 0.03801599974965524931, 0.03880799858737457586, 0.03959999978542327881, 0.04039200098346072687, 0.04118400218149816799, 0.04197600337953561606, 0.04276799985694469675, 0.04355999732973181438, 0.04435199852776362806, 0.04514399972580669662, 0.04593600092384413774, 0.04672800212188158581, 0.04751999859933063453, 0.04831199979736808259, 0.04910400099539664193, 0.04989600219344297177, 0.05068799966621675979, 0.0514800008642275625, 0.05227199734167661122, 0.05306399853971405928, 0.0538559997377515004, 0.05464800093579456897, 0.05544000213382638265, 0.05623200333186383071, 0.05702399608402258097, 0.05781599728206002903, 0.05860799848009747015, 0.05939999967813491821, 0.06019200087617236627, 0.0609840020742098074, 0.06177600327224725546, 0.06256799974965633615, 0.06335999722244345378, 0.06415200214576556592, 0.06494399961851833603, 0.06573600454184608255, 0.06652800201459321827, 0.06731999476675197547, 0.06811199969007972199, 0.06890399716282687159, 0.06969600208615460424, 0.07048799955890175384, 0.07128000448222950036, 0.07207199723438825756, 0.07286400215765383159, 0.0736559996304631398, 0.07444799710322479169, 0.07524000202653802205, 0.07603199949928517165, 0.07682399970202452577, 0.07761599717477166149, 0.07840800209809940802, 0.07919999957084655762]
+mod.mWat_flow=[0., 0.00094000001909210667, 0.00188000003818420032, 0.00282000011548394188, 0.0037600000763683486, 0.00469999986216425823, 0.00564000023096800085, 0.0065799997839331107, 0.00752000015273659225, 0.00845999982118585299, 0.00939999972432912362, 0.01033999962747100647, 0.01128000046193490709, 0.01222000036507873456, 0.01315999956786656835, 0.01409999970197641991, 0.01504000030547235182, 0.01597999950826157686, 0.01691999964237170598, 0.01785999931454672687, 0.01879999944865685946, 0.01974000098347702958, 0.02067999925494201294, 0.02161999938905214205, 0.02256000092387231218, 0.02349999919533729553, 0.02444000073015746913, 0.0253799994635575607, 0.02631999913573369182, 0.02726000067055274825, 0.02819999940395283983, 0.02913999907613008464, 0.03008000061094803432, 0.03101999934434812589, 0.03195999901652315373, 0.03290000241397736391, 0.03383999928474341196, 0.03477999895691843285, 0.03571999862909345375, 0.0366600020265587731, 0.03759999889731371892, 0.03853999856948873287, 0.03948000196695405917, 0.04041999883770899804, 0.04135999850988402587, 0.04230000190734934523, 0.04323999877810428411, 0.044179998450279305, 0.04512000184774462436, 0.04605999871849957017, 0.04699999839067459106, 0.04794000178812655305, 0.04888000146028821657, 0.04982000113244988704, 0.05075999892714517375, 0.05169999859930683728, 0.05263999827146626648, 0.05358000166892045585, 0.05452000134108211937, 0.05546000101324378984, 0.05639999880793907655, 0.05733999848010074007, 0.05827999815227128538, 0.05922000154971437252, 0.06016000122187603605, 0.06110000089403769957, 0.06203999868873298629, 0.06298000208618495521, 0.06391999803305631334, 0.06486000143051495748, 0.06580000482791582839, 0.06674000077483159543, 0.06767999856952688909, 0.06861999451646931536, 0.06955999791385021613, 0.07050000131130218506, 0.07143999725817355706, 0.07238000065562551211, 0.07332000405307748103, 0.07425999439727209994, 0.07519999779464413281, 0.07614000119208941264, 0.07707999713896745986, 0.0780200005364194149, 0.07896000393387138383, 0.07989999427807488452, 0.08083999767543803561, 0.08178000107289000453, 0.08271999701976136266, 0.08366000041721333158, 0.08460000381466530051, 0.08553999415887768298, 0.08647999755623195228, 0.08742000095368390733, 0.08835999690056195455, 0.08930000029800723438, 0.09024000369545918943, 0.09117999403968046757, 0.09211999743702585508, 0.09306000083447781013, 0.09399999678134918213]
+mod.y=[0., 0.00000358229324209172, 0.00002926257040397096, 0.00010061389919355523, 0.00024243304796979956, 0.00048030270487037062, 0.00084014091547044876, 0.00134773795182824892, 0.00202828613356626289, 0.00290589791778412014, 0.00400312459988045374, 0.00534046496761182796, 0.00693587447148498633, 0.00880427569451239407, 0.010957068628452582, 0.01340164929638308459, 0.01614092767202201725, 0.01917284857077709154, 0.02248994574601245744, 0.02607888258849519122, 0.02991999940986583145, 0.03403500377147433698, 0.03846457655665624226, 0.04321184550973979771, 0.04827895297624867216, 0.0536670684814453125, 0.05937644284546120949, 0.06540635312552919856, 0.07175524455595974627, 0.07842061495506141844, 0.08539909022715913567, 0.0926865396118437268, 0.10027793605654562736, 0.10816747390265477047, 0.11634865851540680814, 0.12481419511598910999, 0.13355608508532845757, 0.14256572288775429258, 0.15183379205168789916, 0.16135039817486826474, 0.17110499152708716353, 0.18108661834456693529, 0.19128364187854449141, 0.20168400551412188348, 0.21227522449494723444, 0.22304431899777416026, 0.23397787487835139397, 0.24506221844775039065, 0.25628320594671577526, 0.26762639390136011563, 0.27907714247703552246, 0.29062170896223205041, 0.30225168905857158208, 0.31396049643490109293, 0.32574210017122862126, 0.33759127631803476088, 0.34950330568879089954, 0.36147416496596590507, 0.37350054607578220267, 0.38557979660264385391, 0.39770996654021223415, 0.40988997860023040909, 0.42211928379597846162, 0.43439820995747890908, 0.44672771076245876287, 0.45910960415386264932, 0.47154631923396445048, 0.48404137190985907502, 0.49659877115496053879, 0.50922334496203425225, 0.52192081540090240477, 0.53469761978284979786, 0.54756095295033391235, 0.56051907444426563032, 0.57358072938437321131, 0.5867557525634765625, 0.6000546344544773758, 0.61348881916082520505, 0.62707052567221521766, 0.64081284420757789189, 0.65473000527565072826, 0.66883676905949496216, 0.68314899047080768213, 0.69768341844729520052, 0.71245781521448303675, 0.72749068703457453466, 0.74280188260997148664, 0.75841211522352036667, 0.7743429618514147128, 0.79061725114422498617, 0.80725888460372752231, 0.82429285307759025958, 0.84174552598381136015, 0.85964416164130474929, 0.87801742998871679102, 0.89689537190694668123, 0.91630922025306227319, 0.93629163679737670289, 0.95687689383611507221, 0.97810063697079963063, 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_Examples_CoolingAndHeating.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_Examples_CoolingAndHeating.txt
new file mode 100644
index 00000000..ff8d6686
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_Examples_CoolingAndHeating.txt
@@ -0,0 +1,15 @@
+last-generated=2017-03-31
+statistics-initialization=
+{
+ "linear": "0, 0"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "6",
+ "linear": " "
+}
+vol.T=[2.931499938964844e+02, 2.95150146484375e+02, 2.951503295898438e+02, 2.951504821777344e+02, 2.95150634765625e+02, 2.951507873535156e+02, 2.951509094238281e+02, 2.951510314941406e+02, 2.951511840820312e+02, 2.951513061523438e+02, 2.954037475585938e+02, 2.959230651855469e+02, 2.964556579589844e+02, 2.969931335449219e+02, 2.975270080566406e+02, 2.980488891601562e+02, 2.981504211425781e+02, 2.98150390625e+02, 2.981503601074219e+02, 2.981503295898438e+02, 2.981502990722656e+02, 2.981502685546875e+02, 2.981502380371094e+02, 2.981501770019531e+02, 2.981501159667969e+02, 2.981499938964844e+02, 2.9814990234375e+02, 2.981498413085938e+02, 2.981497802734375e+02, 2.981497192382812e+02, 2.981496887207031e+02, 2.981496887207031e+02, 2.98149658203125e+02, 2.981496276855469e+02, 2.981495971679688e+02, 2.981183471679688e+02, 2.97606689453125e+02, 2.970740661621094e+02, 2.965365905761719e+02, 2.960027160644531e+02, 2.954808349609375e+02, 2.95148681640625e+02, 2.951488037109375e+02, 2.9514892578125e+02, 2.951490783691406e+02, 2.951492004394531e+02, 2.951493530273438e+02, 2.951495056152344e+02, 2.95149658203125e+02, 2.951498107910156e+02, 2.951499938964844e+02, 2.95150146484375e+02, 2.951503295898438e+02, 2.951504821777344e+02, 2.95150634765625e+02, 2.951507873535156e+02, 2.951509094238281e+02, 2.951510314941406e+02, 2.951511840820312e+02, 2.951513061523438e+02, 2.954037475585938e+02, 2.959230651855469e+02, 2.964556579589844e+02, 2.969931335449219e+02, 2.975270080566406e+02, 2.980488891601562e+02, 2.981504211425781e+02, 2.98150390625e+02, 2.981503601074219e+02, 2.981503295898438e+02, 2.981502990722656e+02, 2.981502685546875e+02, 2.981502380371094e+02, 2.981501770019531e+02, 2.981501159667969e+02, 2.981499938964844e+02, 2.9814990234375e+02, 2.981498413085938e+02, 2.981497802734375e+02, 2.981497192382812e+02, 2.981496887207031e+02, 2.981496887207031e+02, 2.98149658203125e+02, 2.981496276855469e+02, 2.981495971679688e+02, 2.981183776855469e+02, 2.97606689453125e+02, 2.970740661621094e+02, 2.965365905761719e+02, 2.960027160644531e+02, 2.954808349609375e+02, 2.95148681640625e+02, 2.951488037109375e+02, 2.9514892578125e+02, 2.951490783691406e+02, 2.951492004394531e+02, 2.951493530273438e+02, 2.951495056152344e+02, 2.95149658203125e+02, 2.951498107910156e+02, 2.951499938964844e+02]
+time=[0e+00, 1.728e+05]
+beaCooHea.heaToRoo.Q_flow=[2.832e+03, 7.37854736328125e+02, 7.096629028320312e+02, 6.631395263671875e+02, 5.990181884765625e+02, 5.183107299804688e+02, 4.222903137207031e+02, 3.124721069335936e+02, 1.905940399169922e+02, 5.857016754150391e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -1.224943542480469e+02, -2.545619812011721e+02, -3.764866027832031e+02, -4.863473510742188e+02, -5.824111938476562e+02, -6.63166259765625e+02, -7.27343505859375e+02, -7.739242553710938e+02, -8.0218359375e+02, -8.116768188476562e+02, -8.022432861328125e+02, -7.740253295898438e+02, -7.274727783203123e+02, -6.633231811523438e+02, -5.8258056640625e+02, -4.865291137695312e+02, -3.766827087402344e+02, -2.547740631103516e+02, -1.227279510498041e+02, -2.362554596402333e-13, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.784006500244141e+01, 1.899322814941406e+02, 3.118840942382812e+02, 4.217740173339844e+02, 5.178703002929688e+02, 5.98658203125e+02, 6.628650512695312e+02, 7.094773559570312e+02, 7.377611083984375e+02, 7.472703247070312e+02, 7.37854736328125e+02, 7.096622314453125e+02, 6.63136962890625e+02, 5.9901513671875e+02, 5.18309020996093e+02, 4.222917480468741e+02, 3.124751281738291e+02, 1.905926208496094e+02, 5.857080841064453e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -1.224943618774414e+02, -2.545618743896484e+02, -3.764867858886728e+02, -4.863475341796866e+02, -5.824128417968742e+02, -6.6316748046875e+02, -7.273427734375e+02, -7.739122314453125e+02, -8.0218408203125e+02, -8.116775512695312e+02, -8.022437744140625e+02, -7.740250854492188e+02, -7.274722290039062e+02, -6.63322509765625e+02, -5.825762329101562e+02, -4.865291748046875e+02, -3.766826477050781e+02, -2.547746124267578e+02, -1.227262573242188e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.784006881713867e+01, 1.899322814941406e+02, 3.118840942382812e+02, 4.217740478515625e+02, 5.1787060546875e+02, 5.986586303710938e+02, 6.6286474609375e+02, 7.094768676757812e+02, 7.377610473632812e+02, 7.47270263671875e+02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_Examples_CoolingOnly.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_Examples_CoolingOnly.txt
new file mode 100644
index 00000000..b8a2a2fb
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_Examples_CoolingOnly.txt
@@ -0,0 +1,11 @@
+last-generated=2017-03-31
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "4",
+ "linear": " "
+}
+vol.T=[2.931499938964844e+02, 2.925135803222656e+02, 2.926092834472656e+02, 2.927705383300781e+02, 2.929947814941406e+02, 2.932784729003906e+02, 2.936171569824219e+02, 2.940054626464844e+02, 2.944373168945312e+02, 2.949058532714844e+02, 2.954037170410156e+02, 2.959230651855469e+02, 2.964556579589844e+02, 2.969931335449219e+02, 2.975270080566406e+02, 2.980488891601562e+02, 2.981504211425781e+02, 2.98150390625e+02, 2.981503601074219e+02, 2.981503295898438e+02, 2.981502990722656e+02, 2.981502685546875e+02, 2.981502380371094e+02, 2.981501770019531e+02, 2.981501159667969e+02, 2.981499938964844e+02, 2.9814990234375e+02, 2.981498413085938e+02, 2.981497802734375e+02, 2.981497192382812e+02, 2.981496887207031e+02, 2.981496887207031e+02, 2.98149658203125e+02, 2.981496276855469e+02, 2.981495971679688e+02, 2.981183776855469e+02, 2.97606689453125e+02, 2.970740661621094e+02, 2.965365905761719e+02, 2.960027160644531e+02, 2.954808349609375e+02, 2.94979248046875e+02, 2.945057983398438e+02, 2.940679626464844e+02, 2.936726684570312e+02, 2.933261413574219e+02, 2.930338439941406e+02, 2.928003845214844e+02, 2.926294555664062e+02, 2.925237426757812e+02, 2.924849243164062e+02, 2.925135803222656e+02, 2.926092834472656e+02, 2.927705383300781e+02, 2.929947814941406e+02, 2.932784729003906e+02, 2.936171569824219e+02, 2.940054626464844e+02, 2.944373168945312e+02, 2.949058532714844e+02, 2.954037170410156e+02, 2.959230651855469e+02, 2.964556579589844e+02, 2.969931335449219e+02, 2.975270080566406e+02, 2.980488891601562e+02, 2.981504211425781e+02, 2.98150390625e+02, 2.981503601074219e+02, 2.981503295898438e+02, 2.981502990722656e+02, 2.981502685546875e+02, 2.981502380371094e+02, 2.981501770019531e+02, 2.981501159667969e+02, 2.981499938964844e+02, 2.9814990234375e+02, 2.981498413085938e+02, 2.981497802734375e+02, 2.981497192382812e+02, 2.981496887207031e+02, 2.981496887207031e+02, 2.98149658203125e+02, 2.981496276855469e+02, 2.981495971679688e+02, 2.981183776855469e+02, 2.97606689453125e+02, 2.970740661621094e+02, 2.965365905761719e+02, 2.960027160644531e+02, 2.954808349609375e+02, 2.94979248046875e+02, 2.945057983398438e+02, 2.940679626464844e+02, 2.936726684570312e+02, 2.933261413574219e+02, 2.930338439941406e+02, 2.928003845214844e+02, 2.926294555664062e+02, 2.925237426757812e+02, 2.924849243164062e+02]
+time=[0e+00, 1.728e+05]
+beaCoo.heaToRoo.Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -1.224943466186523e+02, -2.545619659423831e+02, -3.764867553710938e+02, -4.863475341796875e+02, -5.824127807617188e+02, -6.631687622070312e+02, -7.273439331054688e+02, -7.73921142578125e+02, -8.021851196289062e+02, -8.116768798828125e+02, -8.022431640625e+02, -7.740250244140625e+02, -7.274722900390623e+02, -6.633191528320312e+02, -5.825784912109375e+02, -4.865276794433594e+02, -3.766824035644531e+02, -2.547742004394531e+02, -1.227282638549799e+02, -2.344791028008331e-13, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -1.224943923950195e+02, -2.545620880126953e+02, -3.764867248535166e+02, -4.863475341796866e+02, -5.82412780761718e+02, -6.631688842773438e+02, -7.273435668945312e+02, -7.739186401367188e+02, -8.021851196289062e+02, -8.116768798828125e+02, -8.022431640625e+02, -7.740250244140625e+02, -7.274722900390625e+02, -6.633191528320312e+02, -5.825784912109375e+02, -4.865276794433594e+02, -3.766824035644531e+02, -2.547742004394531e+02, -1.227282638549805e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_Examples_HeatingOnly.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_Examples_HeatingOnly.txt
new file mode 100644
index 00000000..4a24caa3
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_Examples_HeatingOnly.txt
@@ -0,0 +1,16 @@
+last-generated=2017-03-31
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "5",
+ "linear": " "
+}
+vol.T=[2.931499938964844e+02, 2.95150146484375e+02, 2.951503295898438e+02, 2.951504821777344e+02, 2.95150634765625e+02, 2.951507873535156e+02, 2.951509094238281e+02, 2.951510314941406e+02, 2.951511840820312e+02, 2.951513061523438e+02, 2.954037475585938e+02, 2.959230651855469e+02, 2.964556579589844e+02, 2.969931335449219e+02, 2.975270080566406e+02, 2.980488891601562e+02, 2.985505065917969e+02, 2.990239562988281e+02, 2.994617614746094e+02, 2.998570556640625e+02, 3.002035827636719e+02, 3.004958801269531e+02, 3.007293395996094e+02, 3.009002685546875e+02, 3.010059814453125e+02, 3.010448303222656e+02, 3.010161437988281e+02, 3.009204406738281e+02, 3.007591857910156e+02, 3.005349426269531e+02, 3.002512512207031e+02, 2.999125671386719e+02, 2.995242614746094e+02, 2.990924072265625e+02, 2.986238708496094e+02, 2.981260070800781e+02, 2.97606689453125e+02, 2.970740661621094e+02, 2.965365905761719e+02, 2.960027160644531e+02, 2.954808654785156e+02, 2.95148681640625e+02, 2.951488037109375e+02, 2.9514892578125e+02, 2.951490783691406e+02, 2.951492004394531e+02, 2.951493530273438e+02, 2.951495056152344e+02, 2.95149658203125e+02, 2.951498107910156e+02, 2.951499938964844e+02, 2.95150146484375e+02, 2.951503295898438e+02, 2.951504821777344e+02, 2.95150634765625e+02, 2.951507873535156e+02, 2.951509094238281e+02, 2.951510314941406e+02, 2.951511840820312e+02, 2.951513061523438e+02, 2.954037475585938e+02, 2.959230651855469e+02, 2.964556579589844e+02, 2.969931335449219e+02, 2.975270080566406e+02, 2.980488891601562e+02, 2.985505065917969e+02, 2.990239562988281e+02, 2.994617614746094e+02, 2.998570556640625e+02, 3.002035827636719e+02, 3.004958801269531e+02, 3.007293395996094e+02, 3.009002685546875e+02, 3.010059814453125e+02, 3.010448303222656e+02, 3.010161437988281e+02, 3.009204406738281e+02, 3.007591857910156e+02, 3.005349426269531e+02, 3.002512512207031e+02, 2.999125671386719e+02, 2.995242614746094e+02, 2.990924072265625e+02, 2.986238708496094e+02, 2.981260070800781e+02, 2.97606689453125e+02, 2.970740661621094e+02, 2.965365905761719e+02, 2.960027160644531e+02, 2.954808654785156e+02, 2.95148681640625e+02, 2.951488037109375e+02, 2.9514892578125e+02, 2.951490783691406e+02, 2.951492004394531e+02, 2.951493530273438e+02, 2.951495056152344e+02, 2.95149658203125e+02, 2.951498107910156e+02, 2.951499938964844e+02]
+time=[0e+00, 1.728e+05]
+beaCooHea.heaToRoo.Q_flow=[2.832e+03, 7.37854736328125e+02, 7.096629028320312e+02, 6.631394653320312e+02, 5.990181884765625e+02, 5.183107299804688e+02, 4.222904663085938e+02, 3.124737548828124e+02, 1.905922088623047e+02, 5.85704460144043e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.783955383300781e+01, 1.899322814941406e+02, 3.118841552734375e+02, 4.217740783691406e+02, 5.178703002929688e+02, 5.986583251953125e+02, 6.628646850585938e+02, 7.09477294921875e+02, 7.377611083984375e+02, 7.472702026367188e+02, 7.378544921875e+02, 7.096626586914062e+02, 6.631393432617188e+02, 5.990181274414062e+02, 5.183107910156242e+02, 4.222908630371085e+02, 3.12473632812501e+02, 1.905922241210938e+02, 5.857043075561523e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.783955383300781e+01, 1.899322814941406e+02, 3.118841552734375e+02, 4.217740783691406e+02, 5.178703002929688e+02, 5.986583251953125e+02, 6.6286474609375e+02, 7.09477294921875e+02, 7.377611083984375e+02, 7.47270263671875e+02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_Validation_NumberOfBeams.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_Validation_NumberOfBeams.txt
new file mode 100644
index 00000000..f5a5a5ac
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_Validation_NumberOfBeams.txt
@@ -0,0 +1,18 @@
+last-generated=2016-11-07
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+beaCooHea10.heaToRoo.Q_flow=[-10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., -10920., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320., 28320.]
+beaCooHea.heaToRoo.Q_flow=[-1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., -1092., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832., 2832.]
+time=[0., 5000.]
+pumHotWat.dp=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000.]
+pumHotWat10.dp=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000.]
+pumChiWat10.dp=[-10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+pumChiWat.dp=[-10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., -10000., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+pumChiWat10.m_flow=[0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+pumChiWat.m_flow=[0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+pumHotWat.m_flow=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213]
+pumHotWat10.m_flow=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898, 0.93999999761581420898]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_Validation_NumberOfBeamsDynamics.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_Validation_NumberOfBeamsDynamics.txt
new file mode 100644
index 00000000..86e4a8a7
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_ActiveBeams_Validation_NumberOfBeamsDynamics.txt
@@ -0,0 +1,15 @@
+last-generated=2016-06-24
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "4",
+ "linear": " "
+}
+beaCooHea.air_a.m_flow=[0.07919999957084655762, 0.07919999957084655762]
+beaCooHea.watHea_a.m_flow=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213]
+beaCooHea.watCoo_a.m_flow=[0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0.09399999678134918213, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+time=[0., 500.]
+beaCooHea10.heaPor.T=[298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375]
+beaCooHea10.heaPor.Q_flow=[2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 2184., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875, -4645.294921875]
+beaCooHea.heaPor.Q_flow=[1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 1092., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375, -2322.6474609375]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Examples_AirHeater_T.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Examples_AirHeater_T.txt
new file mode 100644
index 00000000..9b49a1ee
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Examples_AirHeater_T.txt
@@ -0,0 +1,15 @@
+last-generated=2017-05-04
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "8",
+ "linear": "0"
+}
+TSet.y=[2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
+TOut.y=[2.841499938964844e+02, 2.841894226074219e+02, 2.843070983886719e+02, 2.845011291503906e+02, 2.847684631347656e+02, 2.851049194335938e+02, 2.855051574707031e+02, 2.85962890625e+02, 2.864708557128906e+02, 2.870211181640625e+02, 2.876049194335938e+02, 2.882131042480469e+02, 2.888360595703125e+02, 2.894639587402344e+02, 2.900869140625e+02, 2.906950988769531e+02, 2.912789001464844e+02, 2.918291320800781e+02, 2.923371276855469e+02, 2.927948303222656e+02, 2.931950988769531e+02, 2.935315246582031e+02, 2.937988891601562e+02, 2.93992919921875e+02, 2.941105651855469e+02, 2.941499938964844e+02, 2.941105651855469e+02, 2.93992919921875e+02, 2.937988891601562e+02, 2.935315246582031e+02, 2.931950988769531e+02, 2.927948303222656e+02, 2.923371276855469e+02, 2.918291320800781e+02, 2.912789001464844e+02, 2.906950988769531e+02, 2.900869140625e+02, 2.894639587402344e+02, 2.888360595703125e+02, 2.882131042480469e+02, 2.876049194335938e+02, 2.870211181640625e+02, 2.864708557128906e+02, 2.85962890625e+02, 2.855051574707031e+02, 2.851049194335938e+02, 2.847684631347656e+02, 2.845011291503906e+02, 2.843070983886719e+02, 2.841894226074219e+02, 2.841499938964844e+02, 2.841894226074219e+02, 2.843070983886719e+02, 2.845011291503906e+02, 2.847684631347656e+02, 2.851049194335938e+02, 2.855051574707031e+02, 2.85962890625e+02, 2.864708557128906e+02, 2.870211181640625e+02, 2.876049194335938e+02, 2.882131042480469e+02, 2.888360595703125e+02, 2.894639587402344e+02, 2.900869140625e+02, 2.906950988769531e+02, 2.912789001464844e+02, 2.918291320800781e+02, 2.923371276855469e+02, 2.927948303222656e+02, 2.931950988769531e+02, 2.935315246582031e+02, 2.937988891601562e+02, 2.93992919921875e+02, 2.941105651855469e+02, 2.941499938964844e+02, 2.941105651855469e+02, 2.93992919921875e+02, 2.937988891601562e+02, 2.935315246582031e+02, 2.931950988769531e+02, 2.927948303222656e+02, 2.923371276855469e+02, 2.918291320800781e+02, 2.912789001464844e+02, 2.906950988769531e+02, 2.900869140625e+02, 2.894639587402344e+02, 2.888360595703125e+02, 2.882131042480469e+02, 2.876049194335938e+02, 2.870211181640625e+02, 2.864708557128906e+02, 2.85962890625e+02, 2.855051574707031e+02, 2.851049194335938e+02, 2.847684631347656e+02, 2.845011291503906e+02, 2.843070983886719e+02, 2.841894226074219e+02, 2.841499938964844e+02]
+THeaOut.T=[2.931499938964844e+02, 2.902236633300781e+02, 2.90475341796875e+02, 2.904233093261719e+02, 2.903502502441406e+02, 2.902582397460938e+02, 2.901487426757812e+02, 2.900234985351562e+02, 2.89884521484375e+02, 2.897339172363281e+02, 2.895741271972656e+02, 2.894076232910156e+02, 2.89237060546875e+02, 2.891795959472656e+02, 2.893805541992188e+02, 2.982056274414062e+02, 2.936115417480469e+02, 2.935125427246094e+02, 2.933733825683594e+02, 2.932479553222656e+02, 2.931515197753906e+02, 2.932258605957031e+02, 2.933737487792969e+02, 2.935479431152344e+02, 2.937154235839844e+02, 2.938531494140625e+02, 2.939451599121094e+02, 2.939807739257812e+02, 2.93953125e+02, 2.938584289550781e+02, 2.936954040527344e+02, 2.934646301269531e+02, 2.931684875488281e+02, 2.935110778808594e+02, 2.936612548828125e+02, 2.938210754394531e+02, 2.93987548828125e+02, 2.941581115722656e+02, 2.943300476074219e+02, 2.945006408691406e+02, 2.92330078125e+02, 2.906884460449219e+02, 2.893970947265625e+02, 2.900216979980469e+02, 2.90147216796875e+02, 2.902569274902344e+02, 2.903491821289062e+02, 2.904224853515625e+02, 2.904757690429688e+02, 2.905081481933594e+02, 2.905189514160156e+02, 2.905081481933594e+02, 2.904761962890625e+02, 2.904235229492188e+02, 2.903504638671875e+02, 2.902582397460938e+02, 2.901487121582031e+02, 2.900234985351562e+02, 2.898845520019531e+02, 2.897339172363281e+02, 2.895741271972656e+02, 2.894076232910156e+02, 2.89237060546875e+02, 2.891796264648438e+02, 2.893805541992188e+02, 2.982056274414062e+02, 2.93611572265625e+02, 2.935125427246094e+02, 2.933733825683594e+02, 2.932479553222656e+02, 2.931515197753906e+02, 2.932258605957031e+02, 2.933737487792969e+02, 2.935479431152344e+02, 2.937154235839844e+02, 2.938531494140625e+02, 2.939451599121094e+02, 2.939807739257812e+02, 2.93953125e+02, 2.938584289550781e+02, 2.936953735351562e+02, 2.934646301269531e+02, 2.931684875488281e+02, 2.935110473632812e+02, 2.936612548828125e+02, 2.938210754394531e+02, 2.93987548828125e+02, 2.941581115722656e+02, 2.943300476074219e+02, 2.945006103515625e+02, 2.92330078125e+02, 2.906884765625e+02, 2.893970947265625e+02, 2.900216979980469e+02, 2.90147216796875e+02, 2.902569274902344e+02, 2.903491821289062e+02, 2.904224853515625e+02, 2.904757690429688e+02, 2.905081176757812e+02, 2.9051904296875e+02]
+TVol.T=[2.931499938964844e+02, 2.902222900390625e+02, 2.891497802734375e+02, 2.891502990722656e+02, 2.89150390625e+02, 2.891504516601562e+02, 2.891505432128906e+02, 2.891506042480469e+02, 2.891506652832031e+02, 2.891507263183594e+02, 2.891507568359375e+02, 2.891507873535156e+02, 2.891507873535156e+02, 2.891796569824219e+02, 2.893807067871094e+02, 2.927337951660156e+02, 2.93154541015625e+02, 2.931506652832031e+02, 2.931506042480469e+02, 2.931505432128906e+02, 2.931515197753906e+02, 2.932259216308594e+02, 2.933738403320312e+02, 2.935480651855469e+02, 2.937155151367188e+02, 2.938532104492188e+02, 2.939452209472656e+02, 2.939807739257812e+02, 2.939530639648438e+02, 2.938583679199219e+02, 2.936952819824219e+02, 2.934644775390625e+02, 2.931683044433594e+02, 2.931493530273438e+02, 2.931492919921875e+02, 2.931492309570312e+02, 2.931492309570312e+02, 2.931492004394531e+02, 2.931492004394531e+02, 2.931492309570312e+02, 2.923289794921875e+02, 2.906876220703125e+02, 2.893964233398438e+02, 2.891493835449219e+02, 2.891494445800781e+02, 2.891495361328125e+02, 2.891495971679688e+02, 2.891496887207031e+02, 2.891497802734375e+02, 2.8914990234375e+02, 2.891499938964844e+02, 2.891500854492188e+02, 2.891501770019531e+02, 2.891502990722656e+02, 2.89150390625e+02, 2.891504516601562e+02, 2.891505432128906e+02, 2.891506042480469e+02, 2.891506652832031e+02, 2.891507263183594e+02, 2.891507568359375e+02, 2.891507873535156e+02, 2.891507873535156e+02, 2.891796875e+02, 2.893807067871094e+02, 2.927337951660156e+02, 2.93154541015625e+02, 2.931506652832031e+02, 2.931506042480469e+02, 2.931505432128906e+02, 2.931515197753906e+02, 2.932259216308594e+02, 2.933738403320312e+02, 2.935480346679688e+02, 2.937155151367188e+02, 2.938532104492188e+02, 2.939452209472656e+02, 2.939807739257812e+02, 2.939530944824219e+02, 2.938583679199219e+02, 2.936952819824219e+02, 2.934644775390625e+02, 2.931683044433594e+02, 2.931493530273438e+02, 2.931492919921875e+02, 2.931492309570312e+02, 2.931492309570312e+02, 2.931492004394531e+02, 2.931492004394531e+02, 2.931492309570312e+02, 2.923289794921875e+02, 2.906876220703125e+02, 2.893964233398438e+02, 2.891493835449219e+02, 2.891494445800781e+02, 2.891495361328125e+02, 2.891495971679688e+02, 2.891496887207031e+02, 2.891497802734375e+02, 2.8914990234375e+02, 2.891499938964844e+02]
+time=[0e+00, 1.728e+05]
+hea.TSet=[2.881499938964844e+02, 2.881499938964844e+02, 2.904757690429688e+02, 2.904229125976562e+02, 2.903497009277344e+02, 2.902575988769531e+02, 2.901480102539062e+02, 2.900226745605469e+02, 2.898836059570312e+02, 2.897329406738281e+02, 2.895730590820312e+02, 2.894065551757812e+02, 2.892359924316406e+02, 2.881499938964844e+02, 2.881499938964844e+02, 3.031499938964844e+02, 2.936127014160156e+02, 2.935116271972656e+02, 2.933725280761719e+02, 2.932472229003906e+02, 2.931125793457031e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.935119018554688e+02, 2.936622619628906e+02, 2.938221130371094e+02, 2.939886474609375e+02, 2.941592102050781e+02, 2.943311157226562e+02, 2.94501708984375e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.900225524902344e+02, 2.901479797363281e+02, 2.90257568359375e+02, 2.903497009277344e+02, 2.904228820800781e+02, 2.904760437011719e+02, 2.9050830078125e+02, 2.905189514160156e+02, 2.905080261230469e+02, 2.904759216308594e+02, 2.90423095703125e+02, 2.903499450683594e+02, 2.902575988769531e+02, 2.9014794921875e+02, 2.900226745605469e+02, 2.898836364746094e+02, 2.897329406738281e+02, 2.895730895996094e+02, 2.894065551757812e+02, 2.892359924316406e+02, 2.881499938964844e+02, 2.881499938964844e+02, 3.031499938964844e+02, 2.936127014160156e+02, 2.935116271972656e+02, 2.933725280761719e+02, 2.932472229003906e+02, 2.931127624511719e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.935119018554688e+02, 2.936622619628906e+02, 2.938221130371094e+02, 2.939886474609375e+02, 2.941592102050781e+02, 2.943311157226562e+02, 2.94501708984375e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.900225524902344e+02, 2.901479797363281e+02, 2.90257568359375e+02, 2.903497009277344e+02, 2.904228820800781e+02, 2.904760437011719e+02, 2.905082397460938e+02, 2.9051904296875e+02]
+hea.Q_flow=[0e+00, 1.972265745280311e-04, 2.614446411132812e+02, 2.510680694580078e+02, 2.366351623535156e+02, 2.184709930419922e+02, 1.968591918945312e+02, 1.721448974609375e+02, 1.447200775146484e+02, 1.150046234130859e+02, 8.347874450683594e+01, 5.0639404296875e+01, 1.699735069274902e+01, 1.972265745280311e-04, 1.972265745280311e-04, 1.079999755859375e+03, 9.015674591064453e+01, 7.135569763183588e+01, 4.392026138305664e+01, 1.919830703735352e+01, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 7.135334777832031e+01, 1.009949035644533e+02, 1.325202484130858e+02, 1.653623352050781e+02, 1.990025787353516e+02, 2.329112396240234e+02, 2.665531311035156e+02, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.720562286376953e+02, 1.968017578125e+02, 2.18419921875e+02, 2.365941925048828e+02, 2.510334777832031e+02, 2.615225830078125e+02, 2.678890380859375e+02, 2.69993408203125e+02, 2.678435363769531e+02, 2.615207214355469e+02, 2.511063690185547e+02, 2.366817932128906e+02, 2.184709472656248e+02, 1.968519897460936e+02, 1.721449890136721e+02, 1.447272338867188e+02, 1.150048217773438e+02, 8.347954559326172e+01, 5.063779830932617e+01, 1.699731636047363e+01, 1.972265745280311e-04, 1.972265745280311e-04, 1.079999755859375e+03, 9.015802001953125e+01, 7.135569000244141e+01, 4.392026138305642e+01, 1.919831275939961e+01, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 7.135122680664062e+01, 1.00995002746582e+02, 1.325203247070312e+02, 1.653621520996094e+02, 1.990028533935547e+02, 2.329110870361328e+02, 2.665530700683594e+02, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.720561981201172e+02, 1.968017578125e+02, 2.18419921875e+02, 2.365941467285156e+02, 2.510335540771484e+02, 2.615226440429688e+02, 2.678784790039062e+02, 2.700133361816406e+02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Examples_AirHeater_u.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Examples_AirHeater_u.txt
new file mode 100644
index 00000000..2ea58309
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Examples_AirHeater_u.txt
@@ -0,0 +1,14 @@
+last-generated=2017-05-02
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "9",
+ "linear": "0, 0"
+}
+THeaOut.T=[2.931499938964844e+02, 2.90322509765625e+02, 2.903781433105469e+02, 2.904346313476562e+02, 2.903507690429688e+02, 2.9025927734375e+02, 2.901500549316406e+02, 2.900249328613281e+02, 2.898860473632812e+02, 2.897355346679688e+02, 2.895758361816406e+02, 2.89409423828125e+02, 2.892388610839844e+02, 2.891783142089844e+02, 2.893721008300781e+02, 2.979071350097656e+02, 2.938722839355469e+02, 2.935127258300781e+02, 2.93375e+02, 2.932490539550781e+02, 2.93152099609375e+02, 2.932228393554688e+02, 2.933671875e+02, 2.935389404296875e+02, 2.937051391601562e+02, 2.938434753417969e+02, 2.939366149902344e+02, 2.939749755859375e+02, 2.93951171875e+02, 2.938601684570312e+02, 2.937016296386719e+02, 2.934760131835938e+02, 2.931847839355469e+02, 2.935202026367188e+02, 2.936590270996094e+02, 2.938192749023438e+02, 2.939858093261719e+02, 2.941563415527344e+02, 2.943282775878906e+02, 2.944989013671875e+02, 2.924077758789062e+02, 2.907777099609375e+02, 2.894869384765625e+02, 2.9001123046875e+02, 2.9014404296875e+02, 2.902558898925781e+02, 2.90348388671875e+02, 2.904219665527344e+02, 2.904754333496094e+02, 2.905079650878906e+02, 2.905191040039062e+02, 2.905087585449219e+02, 2.904768676757812e+02, 2.904241638183594e+02, 2.903508605957031e+02, 2.902587280273438e+02, 2.901494445800781e+02, 2.900247802734375e+02, 2.898865051269531e+02, 2.897363586425781e+02, 2.895760803222656e+02, 2.894093627929688e+02, 2.892388610839844e+02, 2.891784057617188e+02, 2.893721313476562e+02, 2.979071655273438e+02, 2.938724975585938e+02, 2.935127868652344e+02, 2.933751831054688e+02, 2.932491149902344e+02, 2.931520385742188e+02, 2.932228088378906e+02, 2.933671875e+02, 2.935389404296875e+02, 2.937051086425781e+02, 2.938434753417969e+02, 2.939365844726562e+02, 2.939749755859375e+02, 2.93951171875e+02, 2.938601684570312e+02, 2.937016296386719e+02, 2.934760131835938e+02, 2.931847839355469e+02, 2.935201110839844e+02, 2.936589965820312e+02, 2.938193054199219e+02, 2.939858093261719e+02, 2.941563415527344e+02, 2.943282775878906e+02, 2.944989013671875e+02, 2.924077758789062e+02, 2.907777099609375e+02, 2.894869384765625e+02, 2.900107727050781e+02, 2.901441650390625e+02, 2.902557678222656e+02, 2.903483581542969e+02, 2.904219360351562e+02, 2.904754333496094e+02, 2.905079956054688e+02, 2.905191650390625e+02]
+TSet.y=[2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
+TVol.T=[2.931499938964844e+02, 2.902802124023438e+02, 2.891897888183594e+02, 2.891505126953125e+02, 2.891510620117188e+02, 2.891512756347656e+02, 2.891514892578125e+02, 2.891516723632812e+02, 2.891518249511719e+02, 2.891519775390625e+02, 2.891520690917969e+02, 2.891521301269531e+02, 2.891521911621094e+02, 2.891802062988281e+02, 2.89376953125e+02, 2.9255712890625e+02, 2.9315478515625e+02, 2.9315087890625e+02, 2.931517333984375e+02, 2.931515197753906e+02, 2.9315234375e+02, 2.932249450683594e+02, 2.933701477050781e+02, 2.935420532226562e+02, 2.937079162597656e+02, 2.938455810546875e+02, 2.939378051757812e+02, 2.9397509765625e+02, 2.939501647949219e+02, 2.938579406738281e+02, 2.936981811523438e+02, 2.934713439941406e+02, 2.931789855957031e+02, 2.931484069824219e+02, 2.931480407714844e+02, 2.931479187011719e+02, 2.931478576660156e+02, 2.931478271484375e+02, 2.931478271484375e+02, 2.931478576660156e+02, 2.923747253417969e+02, 2.907518615722656e+02, 2.894662170410156e+02, 2.891388549804688e+02, 2.891487731933594e+02, 2.89148681640625e+02, 2.8914892578125e+02, 2.89149169921875e+02, 2.891494445800781e+02, 2.891497192382812e+02, 2.891499938964844e+02, 2.891502685546875e+02, 2.891505432128906e+02, 2.891507873535156e+02, 2.891510314941406e+02, 2.891512756347656e+02, 2.891514892578125e+02, 2.891516723632812e+02, 2.891518249511719e+02, 2.891519775390625e+02, 2.89152099609375e+02, 2.891521301269531e+02, 2.891521911621094e+02, 2.891802673339844e+02, 2.893770141601562e+02, 2.9255712890625e+02, 2.931548767089844e+02, 2.9315087890625e+02, 2.931517333984375e+02, 2.931515197753906e+02, 2.931522827148438e+02, 2.932249145507812e+02, 2.933701477050781e+02, 2.935420532226562e+02, 2.937079162597656e+02, 2.938455810546875e+02, 2.939378051757812e+02, 2.9397509765625e+02, 2.939501342773438e+02, 2.938579406738281e+02, 2.936981811523438e+02, 2.934713439941406e+02, 2.931789855957031e+02, 2.931484069824219e+02, 2.931480102539062e+02, 2.931479187011719e+02, 2.931478576660156e+02, 2.931478271484375e+02, 2.931478271484375e+02, 2.931478576660156e+02, 2.923747253417969e+02, 2.907518615722656e+02, 2.894662170410156e+02, 2.891388549804688e+02, 2.891487731933594e+02, 2.89148681640625e+02, 2.8914892578125e+02, 2.89149169921875e+02, 2.891494445800781e+02, 2.891497192382812e+02, 2.891499938964844e+02]
+TOut.y=[2.841499938964844e+02, 2.841894226074219e+02, 2.843070983886719e+02, 2.845011291503906e+02, 2.847684631347656e+02, 2.851049194335938e+02, 2.855051574707031e+02, 2.85962890625e+02, 2.864708557128906e+02, 2.870211181640625e+02, 2.876049194335938e+02, 2.882131042480469e+02, 2.888360595703125e+02, 2.894639587402344e+02, 2.900869140625e+02, 2.906950988769531e+02, 2.912789001464844e+02, 2.918291320800781e+02, 2.923371276855469e+02, 2.927948303222656e+02, 2.931950988769531e+02, 2.935315246582031e+02, 2.937988891601562e+02, 2.93992919921875e+02, 2.941105651855469e+02, 2.941499938964844e+02, 2.941105651855469e+02, 2.93992919921875e+02, 2.937988891601562e+02, 2.935315246582031e+02, 2.931950988769531e+02, 2.927948303222656e+02, 2.923371276855469e+02, 2.918291320800781e+02, 2.912789001464844e+02, 2.906950988769531e+02, 2.900869140625e+02, 2.894639587402344e+02, 2.888360595703125e+02, 2.882131042480469e+02, 2.876049194335938e+02, 2.870211181640625e+02, 2.864708557128906e+02, 2.85962890625e+02, 2.855051574707031e+02, 2.851049194335938e+02, 2.847684631347656e+02, 2.845011291503906e+02, 2.843070983886719e+02, 2.841894226074219e+02, 2.841499938964844e+02, 2.841894226074219e+02, 2.843070983886719e+02, 2.845011291503906e+02, 2.847684631347656e+02, 2.851049194335938e+02, 2.855051574707031e+02, 2.85962890625e+02, 2.864708557128906e+02, 2.870211181640625e+02, 2.876049194335938e+02, 2.882131042480469e+02, 2.888360595703125e+02, 2.894639587402344e+02, 2.900869140625e+02, 2.906950988769531e+02, 2.912789001464844e+02, 2.918291320800781e+02, 2.923371276855469e+02, 2.927948303222656e+02, 2.931950988769531e+02, 2.935315246582031e+02, 2.937988891601562e+02, 2.93992919921875e+02, 2.941105651855469e+02, 2.941499938964844e+02, 2.941105651855469e+02, 2.93992919921875e+02, 2.937988891601562e+02, 2.935315246582031e+02, 2.931950988769531e+02, 2.927948303222656e+02, 2.923371276855469e+02, 2.918291320800781e+02, 2.912789001464844e+02, 2.906950988769531e+02, 2.900869140625e+02, 2.894639587402344e+02, 2.888360595703125e+02, 2.882131042480469e+02, 2.876049194335938e+02, 2.870211181640625e+02, 2.864708557128906e+02, 2.85962890625e+02, 2.855051574707031e+02, 2.851049194335938e+02, 2.847684631347656e+02, 2.845011291503906e+02, 2.843070983886719e+02, 2.841894226074219e+02, 2.841499938964844e+02]
+time=[0e+00, 1.728e+05]
+hea.Q_flow=[0e+00, 0e+00, 2.248486480712891e+02, 2.529291687011719e+02, 2.363208618164062e+02, 2.181725921630859e+02, 1.965285034179688e+02, 1.717649536132812e+02, 1.442952880859375e+02, 1.145453109741211e+02, 8.299907684326172e+01, 5.014252853393555e+01, 1.648608779907227e+01, 0e+00, 0e+00, 1.08e+03, 1.366040802001953e+02, 7.114699554443354e+01, 4.353778076171875e+01, 1.882132911682129e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.357560729980469e+01, 1.01338836669922e+02, 1.329891052246092e+02, 1.658641510009766e+02, 1.99514404296875e+02, 2.334260864257812e+02, 2.67062744140625e+02, 0e+00, 0e+00, 0e+00, 1.753533630371094e+02, 1.966726837158203e+02, 2.187360076904297e+02, 2.368576049804688e+02, 2.512497711181641e+02, 2.616718444824219e+02, 2.679618835449219e+02, 2.700286254882812e+02, 2.678586730957031e+02, 2.614386291503906e+02, 2.509190216064453e+02, 2.3634619140625e+02, 2.180612335205076e+02, 1.964093933105467e+02, 1.717359619140627e+02, 1.443861846923828e+02, 1.147053298950195e+02, 8.303866577148438e+01, 5.013513946533203e+01, 1.648534393310547e+01, 0e+00, 0e+00, 1.08e+03, 1.366124114990234e+02, 7.11517333984375e+01, 4.358527374267556e+01, 1.883110237121602e+01, 5.52891066263328e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.356383514404297e+01, 1.013438034057617e+02, 1.329950561523438e+02, 1.658602905273438e+02, 1.995146484375e+02, 2.3342626953125e+02, 2.670626220703125e+02, 0e+00, 0e+00, 0e+00, 1.752718658447266e+02, 1.966958312988281e+02, 2.187135009765625e+02, 2.368554229736328e+02, 2.512479705810547e+02, 2.616718444824219e+02, 2.679671936035156e+02, 2.700380859375e+02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Examples_WaterCooler_T.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Examples_WaterCooler_T.txt
deleted file mode 100644
index e628d00f..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Examples_WaterCooler_T.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-last-generated=2017-06-05
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "6",
- "linear": "0"
-}
-TSet.y=[2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
-TOut.y=[2.901499938964844e+02, 2.901894226074219e+02, 2.903070983886719e+02, 2.905011291503906e+02, 2.907684631347656e+02, 2.911049194335938e+02, 2.915051574707031e+02, 2.91962890625e+02, 2.924708557128906e+02, 2.930211181640625e+02, 2.936049194335938e+02, 2.942131042480469e+02, 2.948360595703125e+02, 2.954639587402344e+02, 2.960869140625e+02, 2.966950988769531e+02, 2.972789001464844e+02, 2.978291320800781e+02, 2.983371276855469e+02, 2.987948303222656e+02, 2.991950988769531e+02, 2.995315246582031e+02, 2.997988891601562e+02, 2.99992919921875e+02, 3.001105651855469e+02, 3.001499938964844e+02, 3.001105651855469e+02, 2.99992919921875e+02, 2.997988891601562e+02, 2.995315246582031e+02, 2.991950988769531e+02, 2.987948303222656e+02, 2.983371276855469e+02, 2.978291320800781e+02, 2.972789001464844e+02, 2.966950988769531e+02, 2.960869140625e+02, 2.954639587402344e+02, 2.948360595703125e+02, 2.942131042480469e+02, 2.936049194335938e+02, 2.930211181640625e+02, 2.924708557128906e+02, 2.91962890625e+02, 2.915051574707031e+02, 2.911049194335938e+02, 2.907684631347656e+02, 2.905011291503906e+02, 2.903070983886719e+02, 2.901894226074219e+02, 2.901499938964844e+02, 2.901894226074219e+02, 2.903070983886719e+02, 2.905011291503906e+02, 2.907684631347656e+02, 2.911049194335938e+02, 2.915051574707031e+02, 2.91962890625e+02, 2.924708557128906e+02, 2.930211181640625e+02, 2.936049194335938e+02, 2.942131042480469e+02, 2.948360595703125e+02, 2.954639587402344e+02, 2.960869140625e+02, 2.966950988769531e+02, 2.972789001464844e+02, 2.978291320800781e+02, 2.983371276855469e+02, 2.987948303222656e+02, 2.991950988769531e+02, 2.995315246582031e+02, 2.997988891601562e+02, 2.99992919921875e+02, 3.001105651855469e+02, 3.001499938964844e+02, 3.001105651855469e+02, 2.99992919921875e+02, 2.997988891601562e+02, 2.995315246582031e+02, 2.991950988769531e+02, 2.987948303222656e+02, 2.983371276855469e+02, 2.978291320800781e+02, 2.972789001464844e+02, 2.966950988769531e+02, 2.960869140625e+02, 2.954639587402344e+02, 2.948360595703125e+02, 2.942131042480469e+02, 2.936049194335938e+02, 2.930211181640625e+02, 2.924708557128906e+02, 2.91962890625e+02, 2.915051574707031e+02, 2.911049194335938e+02, 2.907684631347656e+02, 2.905011291503906e+02, 2.903070983886719e+02, 2.901894226074219e+02, 2.901499938964844e+02]
-THeaOut.T=[2.931499938964844e+02, 2.908165283203125e+02, 2.889830932617188e+02, 2.891261901855469e+02, 2.891734313964844e+02, 2.891491394042969e+02, 2.891489562988281e+02, 2.891487426757812e+02, 2.891485290527344e+02, 2.891482849121094e+02, 2.891480407714844e+02, 2.891477661132812e+02, 2.891474914550781e+02, 2.89147216796875e+02, 2.891469421386719e+02, 2.894721374511719e+02, 2.90233154296875e+02, 2.909745788574219e+02, 2.91694580078125e+02, 2.923905639648438e+02, 2.930595703125e+02, 2.931471862792969e+02, 2.931470642089844e+02, 2.9314697265625e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.9314697265625e+02, 2.931470642089844e+02, 2.931471862792969e+02, 2.931473388671875e+02, 2.931474914550781e+02, 2.93147705078125e+02, 2.931479187011719e+02, 2.931481628417969e+02, 2.931484375e+02, 2.931487121582031e+02, 2.931489868164062e+02, 2.931492614746094e+02, 2.931495361328125e+02, 2.922979125976562e+02, 2.90375244140625e+02, 2.890551452636719e+02, 2.891494750976562e+02, 2.891489562988281e+02, 2.891491394042969e+02, 2.891492919921875e+02, 2.891494140625e+02, 2.891494750976562e+02, 2.891495361328125e+02, 2.891495666503906e+02, 2.891495361328125e+02, 2.891494750976562e+02, 2.891494140625e+02, 2.891492919921875e+02, 2.891491394042969e+02, 2.891489562988281e+02, 2.891487426757812e+02, 2.891485290527344e+02, 2.891482849121094e+02, 2.891480407714844e+02, 2.891477661132812e+02, 2.891474914550781e+02, 2.89147216796875e+02, 2.891469421386719e+02, 2.894721374511719e+02, 2.90233154296875e+02, 2.909745788574219e+02, 2.916945495605469e+02, 2.923905639648438e+02, 2.930595703125e+02, 2.931471862792969e+02, 2.931470642089844e+02, 2.9314697265625e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.9314697265625e+02, 2.931470642089844e+02, 2.931471862792969e+02, 2.931473083496094e+02, 2.931474914550781e+02, 2.93147705078125e+02, 2.931479187011719e+02, 2.931481628417969e+02, 2.931484375e+02, 2.931487121582031e+02, 2.931489868164062e+02, 2.931492614746094e+02, 2.931495361328125e+02, 2.922979125976562e+02, 2.90375244140625e+02, 2.890551147460938e+02, 2.891494750976562e+02, 2.891489562988281e+02, 2.891491394042969e+02, 2.891492919921875e+02, 2.891494140625e+02, 2.891494750976562e+02, 2.891495361328125e+02, 2.891495666503906e+02]
-TVol.T=[2.931499938964844e+02, 2.908240966796875e+02, 2.889831848144531e+02, 2.891262817382812e+02, 2.891754150390625e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.894725952148438e+02, 2.902335815429688e+02, 2.909750061035156e+02, 2.916949768066406e+02, 2.923909606933594e+02, 2.930599365234375e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.923056335449219e+02, 2.903830261230469e+02, 2.890553588867188e+02, 2.891507568359375e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.894725952148438e+02, 2.902335815429688e+02, 2.909750061035156e+02, 2.916949768066406e+02, 2.923909606933594e+02, 2.930599365234375e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.923056335449219e+02, 2.903830261230469e+02, 2.890553283691406e+02, 2.891507568359375e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
-coo.TSet=[2.831499938964844e+02, 2.831499938964844e+02, 2.9490234375e+02, 3.031499938964844e+02, 2.891713256835938e+02, 2.891491394042969e+02, 2.891489562988281e+02, 2.891487426757812e+02, 2.891485290527344e+02, 2.891482849121094e+02, 2.891480407714844e+02, 2.891477661132812e+02, 2.891474914550781e+02, 2.89147216796875e+02, 2.891469421386719e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.931471862792969e+02, 2.931470642089844e+02, 2.9314697265625e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.9314697265625e+02, 2.931470642089844e+02, 2.931471862792969e+02, 2.931473388671875e+02, 2.931474914550781e+02, 2.93147705078125e+02, 2.931479187011719e+02, 2.931481628417969e+02, 2.931484375e+02, 2.931487121582031e+02, 2.931489868164062e+02, 2.931492614746094e+02, 2.931495361328125e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.962571411132812e+02, 2.891494140625e+02, 2.891489562988281e+02, 2.891491394042969e+02, 2.891492919921875e+02, 2.891494140625e+02, 2.891494750976562e+02, 2.891495361328125e+02, 2.891495666503906e+02, 2.891495361328125e+02, 2.891494750976562e+02, 2.891494140625e+02, 2.891492919921875e+02, 2.891491394042969e+02, 2.891489562988281e+02, 2.891487426757812e+02, 2.891485290527344e+02, 2.891482849121094e+02, 2.891480407714844e+02, 2.891477661132812e+02, 2.891474914550781e+02, 2.891471862792969e+02, 2.891469421386719e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.931471862792969e+02, 2.931470642089844e+02, 2.9314697265625e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.9314697265625e+02, 2.931470642089844e+02, 2.931471862792969e+02, 2.931473388671875e+02, 2.931474914550781e+02, 2.93147705078125e+02, 2.931479187011719e+02, 2.931481628417969e+02, 2.931484375e+02, 2.931487121582031e+02, 2.931489868164062e+02, 2.931492614746094e+02, 2.931495361328125e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.962591552734375e+02, 2.891494140625e+02, 2.891489562988281e+02, 2.891491394042969e+02, 2.891492919921875e+02, 2.891494140625e+02, 2.891494750976562e+02, 2.891495361328125e+02, 2.891495666503906e+02]
-time=[0e+00, 1.728e+05]
-coo.Q_flow=[-0e+00, -9.998870239257812e+02, -1.129679977893829e-01, -1.129679977893829e-01, -2.439601898193359e+02, -9.774540710449219e+01, -1.177577667236328e+02, -1.406441345214844e+02, -1.660428161621094e+02, -1.935569458007812e+02, -2.227466888427734e+02, -2.531519317626953e+02, -2.843023071289062e+02, -3.156974182128906e+02, -3.468455810546876e+02, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -3.192256164550781e+02, -3.324441223144531e+02, -3.42145751953125e+02, -3.480289916992188e+02, -3.500010986328125e+02, -3.480212707519531e+02, -3.4214599609375e+02, -3.324527282714843e+02, -3.190949401855469e+02, -3.022267150878906e+02, -2.821668090820312e+02, -2.592820129394531e+02, -2.339390563964844e+02, -2.065047302246093e+02, -1.773457946777345e+02, -1.468454132080078e+02, -1.156976547241211e+02, -8.430248260498047e+01, -5.315433502197266e+01, -9.998870239257812e+02, -9.998870239257812e+02, -1.129679977893829e-01, -1.455669555664062e+02, -1.177577896118164e+02, -9.774570465087891e+01, -8.092398071289062e+01, -6.755516815185547e+01, -5.785074615478516e+01, -5.198362350463867e+01, -5.001266098022461e+01, -5.195882415771484e+01, -5.784308242797852e+01, -6.751511383056641e+01, -8.096443176269531e+01, -9.788916015625016e+01, -1.179434204101564e+02, -1.407813262939451e+02, -1.660569763183594e+02, -1.934244995117188e+02, -2.225380096435547e+02, -2.530516204833984e+02, -2.847418823242188e+02, -3.162342529296875e+02, -3.469652709960938e+02, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -3.192214660644531e+02, -3.324442443847656e+02, -3.421459045410156e+02, -3.480279235839844e+02, -3.499997863769531e+02, -3.480293884277344e+02, -3.421408081054688e+02, -3.324189758300781e+02, -3.190643920898438e+02, -3.022776489257812e+02, -2.8225927734375e+02, -2.593698425292969e+02, -2.33937744140625e+02, -2.063929748535156e+02, -1.771987762451172e+02, -1.468184356689453e+02, -1.15715202331543e+02, -8.435236358642578e+01, -5.319318389892578e+01, -9.998870239257812e+02, -9.998870239257812e+02, -1.129679977893829e-01, -1.455773315429688e+02, -1.177580261230469e+02, -9.774573516845703e+01, -8.092378234863281e+01, -6.755569458007812e+01, -5.785653686523438e+01, -5.197085952758789e+01, -4.999994277954102e+01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Examples_WaterHeater_T.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Examples_WaterHeater_T.txt
new file mode 100644
index 00000000..ecc58ca7
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Examples_WaterHeater_T.txt
@@ -0,0 +1,15 @@
+last-generated=2017-05-04
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "6",
+ "linear": "0"
+}
+TSet.y=[2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
+TOut.y=[2.841499938964844e+02, 2.841894226074219e+02, 2.843070983886719e+02, 2.845011291503906e+02, 2.847684631347656e+02, 2.851049194335938e+02, 2.855051574707031e+02, 2.85962890625e+02, 2.864708557128906e+02, 2.870211181640625e+02, 2.876049194335938e+02, 2.882131042480469e+02, 2.888360595703125e+02, 2.894639587402344e+02, 2.900869140625e+02, 2.906950988769531e+02, 2.912789001464844e+02, 2.918291320800781e+02, 2.923371276855469e+02, 2.927948303222656e+02, 2.931950988769531e+02, 2.935315246582031e+02, 2.937988891601562e+02, 2.93992919921875e+02, 2.941105651855469e+02, 2.941499938964844e+02, 2.941105651855469e+02, 2.93992919921875e+02, 2.937988891601562e+02, 2.935315246582031e+02, 2.931950988769531e+02, 2.927948303222656e+02, 2.923371276855469e+02, 2.918291320800781e+02, 2.912789001464844e+02, 2.906950988769531e+02, 2.900869140625e+02, 2.894639587402344e+02, 2.888360595703125e+02, 2.882131042480469e+02, 2.876049194335938e+02, 2.870211181640625e+02, 2.864708557128906e+02, 2.85962890625e+02, 2.855051574707031e+02, 2.851049194335938e+02, 2.847684631347656e+02, 2.845011291503906e+02, 2.843070983886719e+02, 2.841894226074219e+02, 2.841499938964844e+02, 2.841894226074219e+02, 2.843070983886719e+02, 2.845011291503906e+02, 2.847684631347656e+02, 2.851049194335938e+02, 2.855051574707031e+02, 2.85962890625e+02, 2.864708557128906e+02, 2.870211181640625e+02, 2.876049194335938e+02, 2.882131042480469e+02, 2.888360595703125e+02, 2.894639587402344e+02, 2.900869140625e+02, 2.906950988769531e+02, 2.912789001464844e+02, 2.918291320800781e+02, 2.923371276855469e+02, 2.927948303222656e+02, 2.931950988769531e+02, 2.935315246582031e+02, 2.937988891601562e+02, 2.93992919921875e+02, 2.941105651855469e+02, 2.941499938964844e+02, 2.941105651855469e+02, 2.93992919921875e+02, 2.937988891601562e+02, 2.935315246582031e+02, 2.931950988769531e+02, 2.927948303222656e+02, 2.923371276855469e+02, 2.918291320800781e+02, 2.912789001464844e+02, 2.906950988769531e+02, 2.900869140625e+02, 2.894639587402344e+02, 2.888360595703125e+02, 2.882131042480469e+02, 2.876049194335938e+02, 2.870211181640625e+02, 2.864708557128906e+02, 2.85962890625e+02, 2.855051574707031e+02, 2.851049194335938e+02, 2.847684631347656e+02, 2.845011291503906e+02, 2.843070983886719e+02, 2.841894226074219e+02, 2.841499938964844e+02]
+THeaOut.T=[2.931499938964844e+02, 2.93054931640625e+02, 2.929616394042969e+02, 2.928709716796875e+02, 2.927837524414062e+02, 2.927006530761719e+02, 2.926222839355469e+02, 2.925494384765625e+02, 2.924824829101562e+02, 2.924218139648438e+02, 2.923677673339844e+02, 2.923206176757812e+02, 2.922806091308594e+02, 2.922476501464844e+02, 2.922216491699219e+02, 2.922910766601562e+02, 2.924892883300781e+02, 2.926914367675781e+02, 2.928970336914062e+02, 2.931055908203125e+02, 2.932561645507812e+02, 2.932575988769531e+02, 2.932622375488281e+02, 2.932692565917969e+02, 2.932778625488281e+02, 2.932872314453125e+02, 2.932964782714844e+02, 2.933049011230469e+02, 2.933114318847656e+02, 2.933153991699219e+02, 2.93316162109375e+02, 2.933130798339844e+02, 2.933054809570312e+02, 2.932928161621094e+02, 2.932745971679688e+02, 2.932505798339844e+02, 2.932204895019531e+02, 2.931841735839844e+02, 2.931416015625e+02, 2.931016845703125e+02, 2.931557312011719e+02, 2.930939331054688e+02, 2.930267639160156e+02, 2.929547119140625e+02, 2.928782653808594e+02, 2.92798095703125e+02, 2.9271484375e+02, 2.926292419433594e+02, 2.925421142578125e+02, 2.924542846679688e+02, 2.923661499023438e+02, 2.922791442871094e+02, 2.921942749023438e+02, 2.921121215820312e+02, 2.920332641601562e+02, 2.919583435058594e+02, 2.918879699707031e+02, 2.918226928710938e+02, 2.917631530761719e+02, 2.917099609375e+02, 2.916631774902344e+02, 2.916236267089844e+02, 2.915912170410156e+02, 2.915657653808594e+02, 2.915470886230469e+02, 2.916239013671875e+02, 2.918292236328125e+02, 2.920383605957031e+02, 2.922508850097656e+02, 2.9246630859375e+02, 2.926840209960938e+02, 2.929032897949219e+02, 2.931234741210938e+02, 2.932631225585938e+02, 2.932718200683594e+02, 2.932812194824219e+02, 2.932905578613281e+02, 2.932989501953125e+02, 2.933056030273438e+02, 2.933096923828125e+02, 2.93310546875e+02, 2.933074951171875e+02, 2.933000793457031e+02, 2.932874145507812e+02, 2.932691345214844e+02, 2.932450866699219e+02, 2.932150573730469e+02, 2.931788940429688e+02, 2.931363830566406e+02, 2.931189270019531e+02, 2.931500549316406e+02, 2.930883178710938e+02, 2.930212097167969e+02, 2.929491882324219e+02, 2.92872802734375e+02, 2.927926635742188e+02, 2.9270947265625e+02, 2.926239624023438e+02, 2.925368957519531e+02, 2.924490966796875e+02, 2.923613891601562e+02]
+TVol.T=[2.931499938964844e+02, 2.930548706054688e+02, 2.929615783691406e+02, 2.928709411621094e+02, 2.9278369140625e+02, 2.927005920410156e+02, 2.926222534179688e+02, 2.925493774414062e+02, 2.924824523925781e+02, 2.924217834472656e+02, 2.923677368164062e+02, 2.923205871582031e+02, 2.922805786132812e+02, 2.922476501464844e+02, 2.922216491699219e+02, 2.922903137207031e+02, 2.92488525390625e+02, 2.92690673828125e+02, 2.928962707519531e+02, 2.931048278808594e+02, 2.932561645507812e+02, 2.932575988769531e+02, 2.932622375488281e+02, 2.932692565917969e+02, 2.932778625488281e+02, 2.932872314453125e+02, 2.932964782714844e+02, 2.933049011230469e+02, 2.933114318847656e+02, 2.933153991699219e+02, 2.93316162109375e+02, 2.933130798339844e+02, 2.933054809570312e+02, 2.932928161621094e+02, 2.932745971679688e+02, 2.932505493164062e+02, 2.932204895019531e+02, 2.931841735839844e+02, 2.931415710449219e+02, 2.931008911132812e+02, 2.931557006835938e+02, 2.930939025878906e+02, 2.930267333984375e+02, 2.929546508789062e+02, 2.928782043457031e+02, 2.927980346679688e+02, 2.927147827148438e+02, 2.926291809082031e+02, 2.925420532226562e+02, 2.924542236328125e+02, 2.923660888671875e+02, 2.922791137695312e+02, 2.921942443847656e+02, 2.92112060546875e+02, 2.920332336425781e+02, 2.919583129882812e+02, 2.918879089355469e+02, 2.918226623535156e+02, 2.917631225585938e+02, 2.917099304199219e+02, 2.916631469726562e+02, 2.916236267089844e+02, 2.915912170410156e+02, 2.915657653808594e+02, 2.915470886230469e+02, 2.916231384277344e+02, 2.918284606933594e+02, 2.9203759765625e+02, 2.922501220703125e+02, 2.924655456542969e+02, 2.926832580566406e+02, 2.929025573730469e+02, 2.931227111816406e+02, 2.932631225585938e+02, 2.932718200683594e+02, 2.9328125e+02, 2.932905578613281e+02, 2.932989501953125e+02, 2.933056030273438e+02, 2.933096923828125e+02, 2.93310546875e+02, 2.933074951171875e+02, 2.933000793457031e+02, 2.932873840332031e+02, 2.932691040039062e+02, 2.932450561523438e+02, 2.932150573730469e+02, 2.931788635253906e+02, 2.931363525390625e+02, 2.931181335449219e+02, 2.931500244140625e+02, 2.930882873535156e+02, 2.930211791992188e+02, 2.929491577148438e+02, 2.928727722167969e+02, 2.927926330566406e+02, 2.927094421386719e+02, 2.926239013671875e+02, 2.925368347167969e+02, 2.924490356445312e+02, 2.923613586425781e+02]
+time=[0e+00, 1.728e+05]
+hea.TSet=[2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.846905822753906e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.835526733398438e+02, 2.93623046875e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.84023193359375e+02, 2.945534057617188e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02]
+hea.Q_flow=[0e+00, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 9.988703155517578e+01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 9.988703155517578e+01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Examples_WaterHeater_u.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Examples_WaterHeater_u.txt
new file mode 100644
index 00000000..77ef31d3
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Examples_WaterHeater_u.txt
@@ -0,0 +1,14 @@
+last-generated=2017-05-02
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "6",
+ "linear": "0"
+}
+THeaOut.T=[2.931499938964844e+02, 2.93131591796875e+02, 2.931133117675781e+02, 2.930953979492188e+02, 2.930780029296875e+02, 2.930612487792969e+02, 2.930452880859375e+02, 2.930302429199219e+02, 2.930162353515625e+02, 2.930033569335938e+02, 2.929916381835938e+02, 2.929811706542969e+02, 2.929720153808594e+02, 2.929641418457031e+02, 2.929575805664062e+02, 2.931238098144531e+02, 2.931834411621094e+02, 2.931800842285156e+02, 2.931778564453125e+02, 2.931766052246094e+02, 2.931762390136719e+02, 2.931766357421875e+02, 2.931776428222656e+02, 2.931791381835938e+02, 2.931809387207031e+02, 2.931828918457031e+02, 2.931848449707031e+02, 2.931866455078125e+02, 2.931881103515625e+02, 2.931891174316406e+02, 2.931895141601562e+02, 2.931891174316406e+02, 2.931878356933594e+02, 2.931855773925781e+02, 2.931822204589844e+02, 2.93177734375e+02, 2.931719970703125e+02, 2.931650390625e+02, 2.931567993164062e+02, 2.931496276855469e+02, 2.931455078125e+02, 2.93133544921875e+02, 2.931203918457031e+02, 2.93106201171875e+02, 2.930910339355469e+02, 2.930750427246094e+02, 2.930582885742188e+02, 2.930409851074219e+02, 2.93023193359375e+02, 2.93005126953125e+02, 2.929869689941406e+02, 2.929688415527344e+02, 2.92950927734375e+02, 2.92933349609375e+02, 2.92916259765625e+02, 2.928998413085938e+02, 2.928841552734375e+02, 2.928692932128906e+02, 2.928556213378906e+02, 2.928431396484375e+02, 2.928318786621094e+02, 2.928218688964844e+02, 2.928130798339844e+02, 2.928055114746094e+02, 2.927992248535156e+02, 2.929657287597656e+02, 2.931851806640625e+02, 2.931818237304688e+02, 2.931795654296875e+02, 2.931783142089844e+02, 2.931779479980469e+02, 2.931783142089844e+02, 2.931793212890625e+02, 2.931808166503906e+02, 2.931826171875e+02, 2.931845703125e+02, 2.931865234375e+02, 2.931883239746094e+02, 2.931897888183594e+02, 2.931907958984375e+02, 2.931911926269531e+02, 2.931907653808594e+02, 2.931894836425781e+02, 2.931872253417969e+02, 2.931838989257812e+02, 2.931793823242188e+02, 2.931736755371094e+02, 2.931666870117188e+02, 2.93158447265625e+02, 2.931494140625e+02, 2.931458129882812e+02, 2.931338500976562e+02, 2.931206970214844e+02, 2.931065063476562e+02, 2.930913391113281e+02, 2.930753479003906e+02, 2.9305859375e+02, 2.93041259765625e+02, 2.930234985351562e+02, 2.930054626464844e+02, 2.929872741699219e+02]
+TSet.y=[2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
+TVol.T=[2.931499938964844e+02, 2.931312561035156e+02, 2.931130065917969e+02, 2.930950927734375e+02, 2.930776977539062e+02, 2.930609741210938e+02, 2.930450134277344e+02, 2.930299682617188e+02, 2.930159912109375e+02, 2.930031433105469e+02, 2.92991455078125e+02, 2.929810180664062e+02, 2.929718627929688e+02, 2.929640197753906e+02, 2.929574890136719e+02, 2.931222534179688e+02, 2.931833801269531e+02, 2.931800537109375e+02, 2.931778259277344e+02, 2.931765747070312e+02, 2.931762390136719e+02, 2.931766357421875e+02, 2.931776733398438e+02, 2.931791687011719e+02, 2.931809692382812e+02, 2.931829223632812e+02, 2.931848754882812e+02, 2.931866760253906e+02, 2.931881408691406e+02, 2.931891174316406e+02, 2.931895141601562e+02, 2.931890869140625e+02, 2.931878051757812e+02, 2.931855163574219e+02, 2.931821594238281e+02, 2.931776428222656e+02, 2.931719055175781e+02, 2.931648864746094e+02, 2.931566162109375e+02, 2.931493835449219e+02, 2.931453247070312e+02, 2.9313330078125e+02, 2.931201477050781e+02, 2.931059265136719e+02, 2.930907592773438e+02, 2.930747375488281e+02, 2.930579833984375e+02, 2.930406494140625e+02, 2.930228881835938e+02, 2.930048217773438e+02, 2.929866333007812e+02, 2.929685363769531e+02, 2.929505920410156e+02, 2.929330444335938e+02, 2.929159545898438e+02, 2.928995666503906e+02, 2.928838806152344e+02, 2.928690490722656e+02, 2.928553771972656e+02, 2.928429260253906e+02, 2.928316955566406e+02, 2.928216857910156e+02, 2.928129272460938e+02, 2.928053894042969e+02, 2.927991333007812e+02, 2.929641723632812e+02, 2.931850891113281e+02, 2.931817626953125e+02, 2.931795349121094e+02, 2.931782836914062e+02, 2.931779479980469e+02, 2.931783447265625e+02, 2.931793518066406e+02, 2.931808471679688e+02, 2.931826477050781e+02, 2.931846313476562e+02, 2.931865844726562e+02, 2.931883544921875e+02, 2.931898193359375e+02, 2.931908264160156e+02, 2.931911926269531e+02, 2.931907653808594e+02, 2.93189453125e+02, 2.931871643066406e+02, 2.931838073730469e+02, 2.931792907714844e+02, 2.931735534667969e+02, 2.931665344238281e+02, 2.931582641601562e+02, 2.931492004394531e+02, 2.931456298828125e+02, 2.931336059570312e+02, 2.931204528808594e+02, 2.931062316894531e+02, 2.93091064453125e+02, 2.930750427246094e+02, 2.930582885742188e+02, 2.930409545898438e+02, 2.93023193359375e+02, 2.93005126953125e+02, 2.929869384765625e+02]
+TOut.y=[2.841499938964844e+02, 2.841894226074219e+02, 2.843070983886719e+02, 2.845011291503906e+02, 2.847684631347656e+02, 2.851049194335938e+02, 2.855051574707031e+02, 2.85962890625e+02, 2.864708557128906e+02, 2.870211181640625e+02, 2.876049194335938e+02, 2.882131042480469e+02, 2.888360595703125e+02, 2.894639587402344e+02, 2.900869140625e+02, 2.906950988769531e+02, 2.912789001464844e+02, 2.918291320800781e+02, 2.923371276855469e+02, 2.927948303222656e+02, 2.931950988769531e+02, 2.935315246582031e+02, 2.937988891601562e+02, 2.93992919921875e+02, 2.941105651855469e+02, 2.941499938964844e+02, 2.941105651855469e+02, 2.93992919921875e+02, 2.937988891601562e+02, 2.935315246582031e+02, 2.931950988769531e+02, 2.927948303222656e+02, 2.923371276855469e+02, 2.918291320800781e+02, 2.912789001464844e+02, 2.906950988769531e+02, 2.900869140625e+02, 2.894639587402344e+02, 2.888360595703125e+02, 2.882131042480469e+02, 2.876049194335938e+02, 2.870211181640625e+02, 2.864708557128906e+02, 2.85962890625e+02, 2.855051574707031e+02, 2.851049194335938e+02, 2.847684631347656e+02, 2.845011291503906e+02, 2.843070983886719e+02, 2.841894226074219e+02, 2.841499938964844e+02, 2.841894226074219e+02, 2.843070983886719e+02, 2.845011291503906e+02, 2.847684631347656e+02, 2.851049194335938e+02, 2.855051574707031e+02, 2.85962890625e+02, 2.864708557128906e+02, 2.870211181640625e+02, 2.876049194335938e+02, 2.882131042480469e+02, 2.888360595703125e+02, 2.894639587402344e+02, 2.900869140625e+02, 2.906950988769531e+02, 2.912789001464844e+02, 2.918291320800781e+02, 2.923371276855469e+02, 2.927948303222656e+02, 2.931950988769531e+02, 2.935315246582031e+02, 2.937988891601562e+02, 2.93992919921875e+02, 2.941105651855469e+02, 2.941499938964844e+02, 2.941105651855469e+02, 2.93992919921875e+02, 2.937988891601562e+02, 2.935315246582031e+02, 2.931950988769531e+02, 2.927948303222656e+02, 2.923371276855469e+02, 2.918291320800781e+02, 2.912789001464844e+02, 2.906950988769531e+02, 2.900869140625e+02, 2.894639587402344e+02, 2.888360595703125e+02, 2.882131042480469e+02, 2.876049194335938e+02, 2.870211181640625e+02, 2.864708557128906e+02, 2.85962890625e+02, 2.855051574707031e+02, 2.851049194335938e+02, 2.847684631347656e+02, 2.845011291503906e+02, 2.843070983886719e+02, 2.841894226074219e+02, 2.841499938964844e+02]
+time=[0e+00, 1.728e+05]
+hea.Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.487673568725586e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.819229888916016e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Radiators_Examples_RadiatorEN442_2.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Radiators_Examples_RadiatorEN442_2.txt
deleted file mode 100644
index 0f57266d..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Radiators_Examples_RadiatorEN442_2.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-last-generated=2017-03-31
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "5, 5, 1, 1, 5"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "0, 0, 5",
- "number of continuous time states": "5",
- "linear": "0, 0, 0, 0, 0"
-}
-rad1.vol[3].T=[2.931499938964844e+02, 2.963342590332031e+02, 3.018470764160156e+02, 3.047345275878906e+02, 3.057644958496094e+02, 3.060709838867188e+02, 3.061531066894531e+02, 3.061736450195312e+02, 3.061785583496094e+02, 3.061796875e+02, 3.06179931640625e+02, 3.061799926757812e+02, 3.061799926757812e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.044687194824219e+02, 3.023924560546875e+02, 3.007682800292969e+02, 2.994835510253906e+02, 2.984569396972656e+02, 2.976288452148438e+02, 2.969552001953125e+02, 2.964027404785156e+02, 2.959463806152344e+02, 2.955668029785156e+02, 2.952490539550781e+02, 2.949815368652344e+02, 2.947550354003906e+02, 2.94562255859375e+02, 2.943973693847656e+02, 2.942557067871094e+02, 2.941334533691406e+02, 2.940275268554688e+02, 2.939353942871094e+02, 2.938549499511719e+02, 2.937844848632812e+02, 2.937225646972656e+02, 2.936679382324219e+02, 2.9361962890625e+02, 2.935768127441406e+02, 2.935386962890625e+02, 2.935047302246094e+02, 2.93474365234375e+02, 2.934471740722656e+02, 2.934227294921875e+02, 2.934007568359375e+02, 2.933809204101562e+02, 2.933629760742188e+02, 2.933467407226562e+02, 2.9333203125e+02, 2.933186340332031e+02, 2.933064575195312e+02, 2.932953491210938e+02, 2.932852172851562e+02, 2.932759399414062e+02, 2.932674255371094e+02, 2.932596130371094e+02, 2.9325244140625e+02, 2.93245849609375e+02, 2.932397766113281e+02, 2.932341613769531e+02, 2.932289733886719e+02, 2.932241821289062e+02, 2.932197570800781e+02, 2.932156372070312e+02, 2.932118225097656e+02, 2.932082824707031e+02, 2.932049865722656e+02, 2.93201904296875e+02, 2.931990661621094e+02, 2.931963806152344e+02, 2.931939086914062e+02, 2.931915588378906e+02, 2.931893920898438e+02, 2.931873474121094e+02, 2.931854553222656e+02, 2.931836547851562e+02, 2.931819458007812e+02, 2.931803588867188e+02, 2.931788635253906e+02, 2.931774597167969e+02, 2.931761169433594e+02]
-rad2.sta_a.T=[3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-rad1.sta_a.T=[3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.079988708496094e+02, 3.051148986816406e+02, 3.028941345214844e+02, 3.011624755859375e+02, 2.99796630859375e+02, 2.987080688476562e+02, 2.978321533203125e+02, 2.9712109375e+02, 2.965391845703125e+02, 2.960593872070312e+02, 2.956610412597656e+02, 2.95328125e+02, 2.950482482910156e+02, 2.948116455078125e+02, 2.946105041503906e+02, 2.94438720703125e+02, 2.942912902832031e+02, 2.941642150878906e+02, 2.940542297363281e+02, 2.939586486816406e+02, 2.938753051757812e+02, 2.938023376464844e+02, 2.937382507324219e+02, 2.936817932128906e+02, 2.936319274902344e+02, 2.935877075195312e+02, 2.935484008789062e+02, 2.935133972167969e+02, 2.934821166992188e+02, 2.934541015625e+02, 2.934289855957031e+02, 2.934063720703125e+02, 2.93385986328125e+02, 2.933675842285156e+02, 2.933509216308594e+02, 2.933358154296875e+02, 2.933220825195312e+02, 2.933096008300781e+02, 2.932982177734375e+02, 2.932878112792969e+02, 2.932783203125e+02, 2.932696228027344e+02, 2.932616271972656e+02, 2.932543029785156e+02, 2.9324755859375e+02, 2.932413330078125e+02, 2.93235595703125e+02, 2.932303161621094e+02, 2.932254333496094e+02, 2.932208862304688e+02, 2.932167053222656e+02, 2.932127990722656e+02, 2.932091979980469e+02, 2.932058410644531e+02, 2.932026977539062e+02, 2.931997985839844e+02, 2.931970825195312e+02, 2.931945495605469e+02, 2.931921691894531e+02, 2.931899719238281e+02, 2.931878967285156e+02, 2.931859436035156e+02, 2.931841125488281e+02, 2.931824035644531e+02, 2.931807861328125e+02, 2.931792602539062e+02, 2.931778259277344e+02]
-sou.T=[3.131499938964844e+02, 3.131499938964844e+02]
-rad1.sta_b.T=[2.931499938964844e+02, 2.934443359375e+02, 2.957607116699219e+02, 2.990314636230469e+02, 3.013275451660156e+02, 3.024618835449219e+02, 3.029177856445312e+02, 3.030778503417969e+02, 3.031289672851562e+02, 3.031441345214844e+02, 3.031484375e+02, 3.031495971679688e+02, 3.0314990234375e+02, 3.031499633789062e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.019110717773438e+02, 3.003889465332031e+02, 2.991814575195312e+02, 2.982140197753906e+02, 2.974317932128906e+02, 2.967940063476562e+02, 2.962699279785156e+02, 2.958361511230469e+02, 2.954747314453125e+02, 2.951717224121094e+02, 2.949161682128906e+02, 2.946994934082031e+02, 2.945148315429688e+02, 2.94356689453125e+02, 2.942206420898438e+02, 2.941031188964844e+02, 2.940011901855469e+02, 2.939124145507812e+02, 2.938348388671875e+02, 2.93766845703125e+02, 2.937070007324219e+02, 2.936542053222656e+02, 2.936074829101562e+02, 2.935659790039062e+02, 2.935290832519531e+02, 2.934961242675781e+02, 2.934666748046875e+02, 2.934402465820312e+02, 2.9341650390625e+02, 2.933951416015625e+02, 2.933758544921875e+02, 2.933583984375e+02, 2.933425903320312e+02, 2.933282470703125e+02, 2.933152160644531e+02, 2.933033447265625e+02, 2.932925109863281e+02, 2.932825927734375e+02, 2.932735290527344e+02, 2.932652282714844e+02, 2.932575988769531e+02, 2.932505798339844e+02, 2.93244140625e+02, 2.932381896972656e+02, 2.932326965332031e+02, 2.932276306152344e+02, 2.932229309082031e+02, 2.932185974121094e+02, 2.932145690917969e+02, 2.932108154296875e+02, 2.932073669433594e+02, 2.932041320800781e+02, 2.932011108398438e+02, 2.931983032226562e+02, 2.931956787109375e+02, 2.931932373046875e+02, 2.931909484863281e+02, 2.931888122558594e+02, 2.931868286132812e+02, 2.931849365234375e+02, 2.931831665039062e+02, 2.931815185546875e+02, 2.93179931640625e+02, 2.93178466796875e+02, 2.931770629882812e+02, 2.931757507324219e+02, 2.931744995117188e+02]
-rad2.sta_b.T=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-time=[0e+00, 1.08e+04]
-rad2.vol[3].T=[3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 3.061800231933594e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-rad2.Q_flow=[-5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-rad1.Q_flow=[0e+00, -1.788752593994141e+02, -3.285541381835938e+02, -4.235721435546875e+02, -4.707776489257812e+02, -4.900485229492188e+02, -4.968892211914062e+02, -4.990886840820312e+02, -4.997457580566406e+02, -4.999315490722656e+02, -4.999820861816406e+02, -4.999954528808594e+02, -4.999988403320312e+02, -4.999997253417969e+02, -4.999999694824219e+02, -5.000000305175781e+02, -5.000000305175781e+02, -5.000000305175781e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -5e+02, -4.189730529785152e+02, -3.24921783447266e+02, -2.550352630615234e+02, -2.023845825195312e+02, -1.622165069580078e+02, -1.312171936035156e+02, -1.070404510498047e+02, -8.799993133544922e+01, -7.286904907226562e+01, -6.074470901489258e+01, -5.095392990112305e+01, -4.299036407470703e+01, -3.646924209594727e+01, -3.10954647064209e+01, -2.66408748626709e+01, -2.292762565612793e+01, -1.98160572052002e+01, -1.719574165344238e+01, -1.497881603240967e+01, -1.309493064880371e+01, -1.148717784881592e+01, -1.010959720611571e+01, -8.924733161926261e+00, -7.90196371078492e+00, -7.016086578369141e+00, -6.246255397796631e+00, -5.575160026550293e+00, -4.988378047943115e+00, -4.4738450050354e+00, -4.021427631378174e+00, -3.622576713562012e+00, -3.270058155059814e+00, -2.957731008529663e+00, -2.680366277694702e+00, -2.433498382568358e+00, -2.213314056396486e+00, -2.016530752182009e+00, -1.840305328369141e+00, -1.682140231132507e+00, -1.539965510368347e+00, -1.411897540092468e+00, -1.296345114707947e+00, -1.191895723342896e+00, -1.097327709197998e+00, -1.011579990386963e+00, -9.337033629417419e-01, -8.628818392753601e-01, -7.983749508857727e-01, -7.395484447479248e-01, -6.858180165290833e-01, -6.366879343986511e-01, -5.916967391967773e-01, -5.5045086145401e-01, -5.125897526741028e-01, -4.778108894824982e-01, -4.458657205104828e-01, -4.165405929088593e-01, -3.896353840827942e-01, -3.649449348449707e-01, -3.422761857509613e-01, -3.214373588562012e-01, -3.022519946098328e-01, -2.845575213432312e-01, -2.681986391544342e-01, -2.530387938022614e-01, -2.389499545097351e-01, -2.258170545101166e-01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Validation_ConstantEffectiveness.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Validation_ConstantEffectiveness.txt
new file mode 100644
index 00000000..a5240de2
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Validation_ConstantEffectiveness.txt
@@ -0,0 +1,21 @@
+last-generated=2016-03-18
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "0, 0",
+ "linear": " "
+}
+hex.sta_a2.T=[283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 293.14995574965735158912, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375]
+hex.sta_b1.T=[303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.35000597636445718308, 303.95001169829714626758, 304.54998753866635752274, 305.149993896484375, 305.75000025430239247726, 306.3500066121203531111, 306.95001169829714626758, 307.54998753866635752274, 308.149993896484375, 308.75000025430239247726, 309.3500066121203531111, 309.95001169829714626758, 310.54998753866635752274, 311.149993896484375, 298.99338237862855294225, 305.04565656774605031387, 307.15963602754425210151, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875, 307.66326904296875]
+hex.sta_b2.T=[293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 308.02999898276465273739, 308.51001017243117985345, 308.98998982756882014655, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375, 309.149993896484375]
+hex.sta_a1.T=[303.149993896484375, 303.149993896484375, 303.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 311.75000025430239247726, 312.3500066121203531111, 312.95001169829714626758, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375]
+time=[0., 360.]
+hex.Q1_flow=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., -337564.75461544468998908997, -348453.94673088949639350176, -359343.11576924304245039821, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875, -362972.875]
+hex.Q2_flow=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 337564.75461544468998908997, 348453.94673088949639350176, 359343.11576924304245039821, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875, 362972.875]
+hex.m2_flow=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1.82573492246659974114, 5.77350282669067382812, 7.95822507739395579307, 9.66091790126419347473, 11.10555342143232593344, 12.38278337120580552266, 13.5400638580322265625, 14.60593552901271507949, 15.59914574579654455988, 16.53279417900809988851, 17.4164672997566434276, 18.2574176788330078125, 19.06130442458646712112, 19.83263461088278489797, 20.57506499257522847302, 21.29162567695928132139, 21.984844207763671875, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375, 22.36067962646484375]
+hex.m1_flow=[15.8113880157470703125, 12.64911069701309109803, 8.36659973051889060969, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 6.32455813347627859855, 11.40175761655071262624, 14.83239388052568230592, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125, 15.8113880157470703125]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Validation_HeaterCooler_u.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Validation_HeaterCooler_u.txt
new file mode 100644
index 00000000..c1ea73e1
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Validation_HeaterCooler_u.txt
@@ -0,0 +1,20 @@
+last-generated=2017-03-31
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": "0, 0"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "6",
+ "linear": " "
+}
+con2.u_m=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.991934204101562e+02, 3.034269409179688e+02, 3.046396789550781e+02, 3.0419775390625e+02, 3.034894714355469e+02, 3.030864868164062e+02, 3.029974975585938e+02, 3.030535278320312e+02, 3.031234436035156e+02, 3.031594543457031e+02, 3.031653442382812e+02, 3.031587829589844e+02, 3.031519470214844e+02, 3.031488037109375e+02, 3.031484680175781e+02, 3.031492004394531e+02, 3.031498718261719e+02, 3.03150146484375e+02, 3.03150146484375e+02, 3.031500854492188e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
+con1.u_m=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.029981689453125e+02, 3.03101806640625e+02, 3.031347045898438e+02, 3.031451416015625e+02, 3.031484680175781e+02, 3.031495056152344e+02, 3.031498413085938e+02, 3.031499633789062e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
+con1.u_s=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
+time=[0e+00, 1.2e+03]
+con2.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 8.307033181190491e-01, 5.779524445533752e-01, 4.617374837398528e-01, 4.509457647800446e-01, 4.784183204174042e-01, 5.026206374168396e-01, 5.125911235809326e-01, 5.1274573802948e-01, 5.098008513450623e-01, 5.075128674507141e-01, 5.066771507263184e-01, 5.067440271377563e-01, 5.070513486862183e-01, 5.072656273841858e-01, 5.073340535163879e-01, 5.073202252388e-01, 5.072885751724243e-01, 5.072686672210693e-01, 5.072632431983948e-01, 5.07265031337738e-01, 5.07267951965332e-01, 5.072699189186096e-01, 5.072706937789917e-01, 5.072706341743469e-01, 5.07270336151123e-01, 5.072700977325439e-01, 5.072700381278992e-01, 5.072699785232544e-01, 5.072699189186096e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01]
+con1.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.003049969673157e-01, 5.05058765411377e-01, 5.065680146217346e-01, 5.070471167564392e-01, 5.07199227809906e-01, 5.072475075721741e-01, 5.072628855705261e-01, 5.072677135467529e-01, 5.072692632675171e-01, 5.072697997093201e-01, 5.072699189186096e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01, 5.072699785232544e-01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Validation_PrescribedOutlet.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Validation_PrescribedOutlet.txt
deleted file mode 100644
index 1ad47ba3..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Validation_PrescribedOutlet.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-last-generated=2017-03-31
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "6",
- "linear": " "
-}
-m_flow.y=[1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 8.399999886751175e-02, 5.999999865889549e-02, 3.599999845027924e-02, 1.200000010430813e-02, -1.200000010430813e-02, -3.599999845027924e-02, -5.999999865889549e-02, -8.399999886751175e-02, -1.000000014901161e-01, -1.000000014901161e-01, -1.000000014901161e-01, -1.000000014901161e-01, -1.000000014901161e-01, -1.000000014901161e-01, -1.000000014901161e-01, -1.000000014901161e-01, -1.000000014901161e-01]
-time=[0e+00, 1.2e+03]
-heaHigPow.TSet=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
-heaHigPowIn.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaHigPowOut.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.170504150390625e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.034046020507812e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.001270446777344e+02, 2.935416870117188e+02, 2.931513366699219e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-cooLimPowIn.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-cooLimPowOut.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.903792419433594e+02, 2.893584289550781e+02, 2.872494201660156e+02, 2.83823486328125e+02, 2.865005493164062e+02, 2.927767028808594e+02, 2.931487121582031e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-cooLimPow.TSet=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02]
-heaCooUnl.TSet=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
-heaCooUnlIn.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaCooUnlOut.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881500244140625e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 3.028752746582031e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.001270446777344e+02, 2.935416870117188e+02, 2.931513366699219e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-cooLimPow.QMin_flow=[-1e+03, -1e+03]
-heaHigPow.QMax_flow=[1e+04, 1e+04]
-cooLimPow.Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -5.020799865722656e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-heaHigPow.Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 3.51456005859375e+03, 2.51039990234375e+03, 1.506239990234375e+03, 5.020799865722656e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-heaCooUnl.Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 3.51456005859375e+03, 2.51039990234375e+03, 1.506239990234375e+03, 5.020799865722656e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Validation_PrescribedOutlet_dynamic.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Validation_PrescribedOutlet_dynamic.txt
deleted file mode 100644
index 8be4dd95..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatExchangers_Validation_PrescribedOutlet_dynamic.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-last-generated=2017-03-31
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "9",
- "linear": " "
-}
-m_flow.y=[1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 8.399999886751175e-02, 5.999999865889549e-02, 3.599999845027924e-02, 1.200000010430813e-02, -1.200000010430813e-02, -3.599999845027924e-02, -5.999999865889549e-02, -8.399999886751175e-02, -1.000000014901161e-01, -1.000000014901161e-01, -1.000000014901161e-01, -1.000000014901161e-01, -1.000000014901161e-01, -1.000000014901161e-01, -1.000000014901161e-01, -1.000000014901161e-01, -1.000000014901161e-01]
-time=[0e+00, 1.2e+03]
-heaHigPow.TSet=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
-heaHigPowIn.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaHigPowOut.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.169521179199219e+02, 3.17050537109375e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.170505676269531e+02, 3.098795776367188e+02, 3.051765747070312e+02, 3.037604370117188e+02, 3.033340148925781e+02, 3.032056579589844e+02, 3.031668395996094e+02, 3.031552429199219e+02, 3.031515808105469e+02, 3.031505126953125e+02, 3.031500854492188e+02, 3.031499328613281e+02, 3.031499633789062e+02, 3.031499633789062e+02, 3.031499633789062e+02, 3.031499633789062e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.001271057128906e+02, 2.9354150390625e+02, 2.93151123046875e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-cooLimPowIn.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-cooLimPowOut.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.907611389160156e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.90379150390625e+02, 2.893582763671875e+02, 2.872495727539062e+02, 2.838233337402344e+02, 2.865003662109375e+02, 2.9277685546875e+02, 2.9314892578125e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-cooLimPow.TSet=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02]
-heaCooUnl.TSet=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
-heaCooUnlIn.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaCooUnlOut.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.898233032226562e+02, 2.886539611816406e+02, 2.883017578125e+02, 2.881957702636719e+02, 2.881637878417969e+02, 2.881541748046875e+02, 2.881513061523438e+02, 2.88150390625e+02, 2.881501159667969e+02, 2.881500549316406e+02, 2.881500549316406e+02, 2.881500244140625e+02, 2.881500244140625e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.920085144042969e+02, 2.997850341796875e+02, 3.0213671875e+02, 3.028447875976562e+02, 3.030579833984375e+02, 3.031221618652344e+02, 3.031415710449219e+02, 3.031473693847656e+02, 3.031492004394531e+02, 3.031497497558594e+02, 3.031499633789062e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.001271057128906e+02, 2.9354150390625e+02, 2.93151123046875e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-cooLimPow.QMin_flow=[-1e+03, -1e+03]
-heaHigPow.QMax_flow=[1e+04, 1e+04]
-cooLimPow.Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -5.020799865722656e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-heaHigPow.Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 6.71821435546875e+03, 4.9471259765625e+03, 4.41387060546875e+03, 4.25329150390625e+03, 4.2049560546875e+03, 4.19034375e+03, 4.1859736328125e+03, 4.18459716796875e+03, 4.18418994140625e+03, 4.18403466796875e+03, 4.1839794921875e+03, 4.18398095703125e+03, 4.18398193359375e+03, 4.18398583984375e+03, 4.18398974609375e+03, 4.18399365234375e+03, 4.18399658203125e+03, 4.1839970703125e+03, 4.18399755859375e+03, 4.183998046875e+03, 4.18399853515625e+03, 4.1839990234375e+03, 4.18399951171875e+03, 4.18399951171875e+03, 4.18399951171875e+03, 4.18399951171875e+03, 4.18399951171875e+03, 4.18399951171875e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 3.51456005859375e+03, 2.51039990234375e+03, 1.506239990234375e+03, 5.020799865722656e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-heaCooUnl.Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.461901123046875e+03, -1.902222900390625e+03, -2.034850952148438e+03, -2.074767578125e+03, -2.086803466796875e+03, -2.09042578125e+03, -2.09150439453125e+03, -2.091858154296875e+03, -2.091958251953125e+03, -2.091975830078125e+03, -2.091984375e+03, -2.091991943359375e+03, -2.09199560546875e+03, -2.09199755859375e+03, -2.091998046875e+03, -2.091998779296875e+03, -2.091999267578125e+03, -2.09199951171875e+03, -2.09199951171875e+03, -2.091999755859375e+03, -2.091999755859375e+03, -2.091999755859375e+03, -2.091999755859375e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.292644119262695e+01, 2.916892822265625e+03, 3.80243701171875e+03, 4.069064697265625e+03, 4.14935400390625e+03, 4.17352197265625e+03, 4.180828125e+03, 4.18301318359375e+03, 4.183701171875e+03, 4.1839052734375e+03, 4.183982421875e+03, 4.18401025390625e+03, 4.184009765625e+03, 4.18400927734375e+03, 4.18400732421875e+03, 4.1840048828125e+03, 4.1840029296875e+03, 4.18400146484375e+03, 4.18400146484375e+03, 4.1840009765625e+03, 4.1840009765625e+03, 4.1840009765625e+03, 4.18400048828125e+03, 4.18400048828125e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 4.184e+03, 3.51456005859375e+03, 2.51039990234375e+03, 1.506239990234375e+03, 5.020799865722656e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Examples_Carnot_TCon.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Examples_Carnot_TCon.txt
new file mode 100644
index 00000000..73d16630
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Examples_Carnot_TCon.txt
@@ -0,0 +1,25 @@
+last-generated=2017-06-16
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": " "
+}
+heaPum.TSet=[3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.171499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02]
+heaPum.sta_b1.T=[3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.171499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02]
+heaPum.sta_a2.T=[2.881499938964844e+02, 2.881499938964844e+02]
+heaPum.sta_b2.T=[2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02]
+time=[0e+00, 3.6e+03]
+heaPum.sta_a1.T=[2.931499938964844e+02, 2.931499938964844e+02]
+heaPum.QEva_flow=[-9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -1.33412328125e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05, -1.4669725e+05]
+heaPum.QCon_flow=[1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 2.3908571875e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05, 2.9885715625e+05]
+heaPum.P=[4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 1.05673390625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05, 1.52159890625e+05]
+heaPum.dp1=[6e+03, 6e+03]
+heaPum.dp2=[1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 2.2878482421875e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04, 2.76617265625e+04]
+heaPum.COP=[3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 2.262496948242188e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00, 1.964099407196045e+00]
+heaPum.COP_nominal=[3.156724214553833e+00, 3.156724214553833e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Examples_Carnot_y.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Examples_Carnot_y.txt
new file mode 100644
index 00000000..7db84c3a
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Examples_Carnot_y.txt
@@ -0,0 +1,20 @@
+last-generated=2017-06-16
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "number of continuous time states": "2",
+ "linear": " "
+}
+heaPum.sta_a1.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.951499938964844e+02, 3.011499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
+heaPum.sta_b2.T=[2.931499938964844e+02, 2.830313720703125e+02, 2.800283813476562e+02, 2.790862731933594e+02, 2.790669250488281e+02, 2.793066101074219e+02, 2.795330505371094e+02, 2.796951904296875e+02, 2.797996520996094e+02, 2.798634033203125e+02, 2.799010314941406e+02, 2.799227905273438e+02, 2.799351806640625e+02, 2.799421997070312e+02, 2.799461059570312e+02, 2.799483032226562e+02, 2.799494934082031e+02, 2.799501647949219e+02, 2.799505310058594e+02, 2.799507446289062e+02, 2.799508666992188e+02, 2.79950927734375e+02, 2.799509582519531e+02, 2.799509887695312e+02, 2.799509887695312e+02, 2.799509887695312e+02, 2.813710327148438e+02, 2.843684692382812e+02, 2.862079772949219e+02, 2.870781555175781e+02, 2.875010986328125e+02, 2.8771240234375e+02, 2.878205261230469e+02, 2.878769226074219e+02, 2.8790673828125e+02, 2.879226989746094e+02, 2.879313049316406e+02, 2.879359741210938e+02, 2.879385070800781e+02, 2.879399108886719e+02, 2.87940673828125e+02, 2.879410705566406e+02, 2.879413146972656e+02, 2.879414367675781e+02, 2.879414978027344e+02, 2.879415283203125e+02, 2.879415588378906e+02, 2.879415588378906e+02, 2.879415893554688e+02, 2.879415893554688e+02, 2.879415893554688e+02, 2.892188415527344e+02, 2.925602722167969e+02, 2.950823364257812e+02, 2.964664306640625e+02, 2.972260437011719e+02, 2.976429138183594e+02, 2.978717041015625e+02, 2.979972534179688e+02, 2.98066162109375e+02, 2.9810400390625e+02, 2.98124755859375e+02, 2.981361389160156e+02, 2.981423950195312e+02, 2.981458129882812e+02, 2.98147705078125e+02, 2.981487426757812e+02, 2.981492919921875e+02, 2.981496276855469e+02, 2.981497802734375e+02, 2.981498718261719e+02, 2.981499328613281e+02, 2.981499633789062e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
+heaPum.sta_a2.T=[2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.941499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
+heaPum.sta_b1.T=[2.931499938964844e+02, 3.004542236328125e+02, 3.025249328613281e+02, 3.052763061523438e+02, 3.083754577636719e+02, 3.099851684570312e+02, 3.107895202636719e+02, 3.111994323730469e+02, 3.114114685058594e+02, 3.115224914550781e+02, 3.115812072753906e+02, 3.116125183105469e+02, 3.116293334960938e+02, 3.116383972167969e+02, 3.11643310546875e+02, 3.116459655761719e+02, 3.116473999023438e+02, 3.11648193359375e+02, 3.116486511230469e+02, 3.116488647460938e+02, 3.116490173339844e+02, 3.116490783691406e+02, 3.116491088867188e+02, 3.116491394042969e+02, 3.116491394042969e+02, 3.116491394042969e+02, 3.117059020996094e+02, 3.119884643554688e+02, 3.124014587402344e+02, 3.127442321777344e+02, 3.129778442382812e+02, 3.131234130859375e+02, 3.132098388671875e+02, 3.132597351074219e+02, 3.132880249023438e+02, 3.133038940429688e+02, 3.13312744140625e+02, 3.133176574707031e+02, 3.133203735351562e+02, 3.133218688964844e+02, 3.133226623535156e+02, 3.133231201171875e+02, 3.133233642578125e+02, 3.133235168457031e+02, 3.133235778808594e+02, 3.133236389160156e+02, 3.133236389160156e+02, 3.133236694335938e+02, 3.133236694335938e+02, 3.133236694335938e+02, 3.133236694335938e+02, 3.120112915039062e+02, 3.08670654296875e+02, 3.061797790527344e+02, 3.048127746582031e+02, 3.040625610351562e+02, 3.036508178710938e+02, 3.034248657226562e+02, 3.033008422851562e+02, 3.032327880859375e+02, 3.031954345703125e+02, 3.031749267578125e+02, 3.031636962890625e+02, 3.031575317382812e+02, 3.031541442871094e+02, 3.031522827148438e+02, 3.031512451171875e+02, 3.031506958007812e+02, 3.03150390625e+02, 3.031502075195312e+02, 3.031501159667969e+02, 3.031500549316406e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
+time=[0e+00, 3.6e+03]
+heaPum.QEva_flow=[-1.4505428125e+05, -6.6369953125e+04, -5.472236328125e+04, -4.827044921875e+04, -4.382949609375e+04, -4.212396484375e+04, -4.14565234375e+04, -4.11856796875e+04, -4.107412890625e+04, -4.10278984375e+04, -4.100869921875e+04, -4.100069921875e+04, -4.09973671875e+04, -4.09959765625e+04, -4.09953984375e+04, -4.099515625e+04, -4.09950546875e+04, -4.0995015625e+04, -4.099499609375e+04, -4.099498828125e+04, -4.0994984375e+04, -4.0994984375e+04, -4.0994984375e+04, -4.0994984375e+04, -4.0994984375e+04, -4.0994984375e+04, -4.286443359375e+04, -4.700080078125001e+04, -4.945128515625001e+04, -5.0434796875e+04, -5.08129296875e+04, -5.095598046875e+04, -5.100978125e+04, -5.102997265625e+04, -5.10375390625e+04, -5.104037890625e+04, -5.10414453125e+04, -5.104184765625e+04, -5.1042e+04, -5.10420546875e+04, -5.104207421875e+04, -5.104208203125e+04, -5.10420859375e+04, -5.104208984375e+04, -5.104208984375e+04, -5.104208984375e+04, -5.104208984375e+04, -5.104208984375e+04, -5.104208984375e+04, -5.104208984375e+04, -5.104208984375e+04, -2.4844771484375e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+heaPum.QCon_flow=[1.5505428125e+05, 7.6369953125e+04, 6.472236328125e+04, 5.827044921875e+04, 5.382949609375e+04, 5.212396484375e+04, 5.14565234375e+04, 5.11856796875e+04, 5.107412890625e+04, 5.10278984375e+04, 5.100869921875e+04, 5.100069921875e+04, 5.09973671875e+04, 5.09959765625e+04, 5.09953984375e+04, 5.099515625e+04, 5.09950546875e+04, 5.0995015625e+04, 5.099499609375e+04, 5.099498828125e+04, 5.0994984375e+04, 5.0994984375e+04, 5.0994984375e+04, 5.0994984375e+04, 5.0994984375e+04, 5.0994984375e+04, 5.286443359375e+04, 5.700080078125001e+04, 5.945128515625001e+04, 6.0434796875e+04, 6.08129296875e+04, 6.095598046875e+04, 6.100978125e+04, 6.102997265625e+04, 6.10375390625e+04, 6.104037890625e+04, 6.10414453125e+04, 6.104184765625e+04, 6.1042e+04, 6.10420546875e+04, 6.104207421875e+04, 6.104208203125e+04, 6.10420859375e+04, 6.104208984375e+04, 6.104208984375e+04, 6.104208984375e+04, 6.104208984375e+04, 6.104208984375e+04, 6.104208984375e+04, 6.104208984375e+04, 6.104208984375e+04, 2.8844771484375e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+heaPum.P=[1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 4e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+heaPum.dp1=[6e+03, 6e+03]
+heaPum.dp2=[6e+03, 6e+03]
+heaPum.COP=[1.550542831420898e+01, 7.636995315551758e+00, 6.472236633300781e+00, 5.82704496383667e+00, 5.382949352264404e+00, 5.212396621704102e+00, 5.145652294158936e+00, 5.118567943572998e+00, 5.107412815093994e+00, 5.102789878845215e+00, 5.100869655609131e+00, 5.100069999694824e+00, 5.09973669052124e+00, 5.099597454071045e+00, 5.099539756774902e+00, 5.099515438079834e+00, 5.099505424499512e+00, 5.099501609802246e+00, 5.099499702453613e+00, 5.099498748779297e+00, 5.099498748779297e+00, 5.099498271942139e+00, 5.099498271942139e+00, 5.099498271942139e+00, 5.099498271942139e+00, 5.099498271942139e+00, 5.286443710327148e+00, 5.700079917907716e+00, 5.945128440856934e+00, 6.043479442596436e+00, 6.081293106079102e+00, 6.095598220825195e+00, 6.100978374481201e+00, 6.102997303009033e+00, 6.103754043579102e+00, 6.104037761688232e+00, 6.10414457321167e+00, 6.104184627532959e+00, 6.104199886322021e+00, 6.10420560836792e+00, 6.104207515716553e+00, 6.104208469390869e+00, 6.104208469390869e+00, 6.104208946228027e+00, 6.104208946228027e+00, 6.104208946228027e+00, 6.104208946228027e+00, 6.104208946228027e+00, 6.104208946228027e+00, 6.104208946228027e+00, 6.104208946228027e+00, 7.211193084716797e+00, 1.092510509490967e+01, 1.57321891784668e+01, 2.082446861267093e+01, 2.536087799072268e+01, 2.881949043273928e+01, 3.115633392333984e+01, 3.260916900634766e+01, 3.346616744995117e+01, 3.395609664916992e+01, 3.423118209838867e+01, 3.438405609130859e+01, 3.446845626831055e+01, 3.451497268676758e+01, 3.454059982299805e+01, 3.455469512939453e+01, 3.456244659423828e+01, 3.456671142578125e+01, 3.456905364990234e+01, 3.457034301757812e+01, 3.4571044921875e+01, 3.457141494750977e+01, 3.457163238525391e+01, 3.457178115844727e+01, 3.457186126708984e+01, 3.457188415527344e+01, 3.457190704345703e+01, 3.45719108581543e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01, 3.457191467285156e+01]
+heaPum.COP_nominal=[6e+00, 6e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Validation_Carnot_TCon_LimitedCapacity.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Validation_Carnot_TCon_LimitedCapacity.txt
new file mode 100644
index 00000000..c39ad71e
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Validation_Carnot_TCon_LimitedCapacity.txt
@@ -0,0 +1,25 @@
+last-generated=2017-06-16
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": " "
+}
+heaPum.TSet=[3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.171499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02]
+heaPum.sta_b1.T=[3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.171499938964844e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02, 3.1824560546875e+02]
+heaPum.sta_a2.T=[2.881499938964844e+02, 2.881499938964844e+02]
+heaPum.sta_b2.T=[2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02]
+time=[0e+00, 3.6e+03]
+heaPum.sta_a1.T=[2.931499938964844e+02, 2.931499938964844e+02]
+heaPum.QEva_flow=[-9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -1.33412328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05, -1.36343328125e+05]
+heaPum.QCon_flow=[1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 2.3908571875e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05, 2.49999984375e+05]
+heaPum.P=[4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 1.05673390625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05, 1.136566640625e+05]
+heaPum.dp1=[6e+03, 6e+03]
+heaPum.dp2=[1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 2.2878482421875e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04, 2.389478125e+04]
+heaPum.COP=[3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 2.262496948242188e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00, 2.199606895446777e+00]
+heaPum.COP_nominal=[3.156724214553833e+00, 3.156724214553833e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Validation_Carnot_TCon_LowTemperature.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Validation_Carnot_TCon_LowTemperature.txt
new file mode 100644
index 00000000..ff4205c0
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Validation_Carnot_TCon_LowTemperature.txt
@@ -0,0 +1,25 @@
+last-generated=2017-06-16
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": " "
+}
+heaPum.sta_a1.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.855499877929688e+02, 2.741499938964844e+02, 2.741499938964844e+02, 2.741499938964844e+02, 2.741499938964844e+02, 2.741499938964844e+02, 2.741499938964844e+02, 2.741499938964844e+02, 2.741499938964844e+02, 2.741499938964844e+02, 2.741499938964844e+02, 2.741499938964844e+02, 2.741499938964844e+02, 2.741499938964844e+02, 2.741499938964844e+02, 2.741499938964844e+02, 2.741499938964844e+02]
+heaPum.TSet=[3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 2.889500122070312e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02]
+heaPum.sta_b1.T=[3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.855499877929688e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02, 2.761499938964844e+02]
+time=[0e+00, 3.6e+03]
+heaPum.QEva_flow=[-9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, -9.99388125e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.968366015625e+04, -1.968366015625e+04, -1.968366015625e+04, -1.968366015625e+04, -1.968366015625e+04, -1.968366015625e+04, -1.968366015625e+04, -1.968366015625e+04, -1.968366015625e+04, -1.968366015625e+04, -1.968366015625e+04, -1.968366015625e+04, -1.968366015625e+04, -1.968366015625e+04, -1.968366015625e+04, -1.968366015625e+04]
+heaPum.QCon_flow=[1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.992380859375e+04, 1.992380859375e+04, 1.992380859375e+04, 1.992380859375e+04, 1.992380859375e+04, 1.992380859375e+04, 1.992380859375e+04, 1.992380859375e+04, 1.992380859375e+04, 1.992380859375e+04, 1.992380859375e+04, 1.992380859375e+04, 1.992380859375e+04, 1.992380859375e+04, 1.992380859375e+04, 1.992380859375e+04]
+heaPum.P=[4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 4.94897578125e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.401484832763672e+02, 2.401484832763672e+02, 2.401484832763672e+02, 2.401484832763672e+02, 2.401484832763672e+02, 2.401484832763672e+02, 2.401484832763672e+02, 2.401484832763672e+02, 2.401484832763672e+02, 2.401484832763672e+02, 2.401484832763672e+02, 2.401484832763672e+02, 2.401484832763672e+02, 2.401484832763672e+02, 2.401484832763672e+02, 2.401484832763672e+02]
+heaPum.dp1=[6e+03, 6e+03]
+heaPum.dp2=[1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 1.28381875e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.980203247070312e+02, 4.980203247070312e+02, 4.980203247070312e+02, 4.980203247070312e+02, 4.980203247070312e+02, 4.980203247070312e+02, 4.980203247070312e+02, 4.980203247070312e+02, 4.980203247070312e+02, 4.980203247070312e+02, 4.980203247070312e+02, 4.980203247070312e+02, 4.980203247070312e+02, 4.980203247070312e+02, 4.980203247070312e+02, 4.980203247070312e+02]
+heaPum.COP=[3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 3.019383907318115e+00, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 1.75890007019043e+01, 8.566500091552734e+01, 8.296454620361328e+01, 8.296454620361328e+01, 8.296454620361328e+01, 8.296454620361328e+01, 8.296454620361328e+01, 8.296454620361328e+01, 8.296454620361328e+01, 8.296454620361328e+01, 8.296454620361328e+01, 8.296454620361328e+01, 8.296454620361328e+01, 8.296454620361328e+01, 8.296454620361328e+01, 8.296454620361328e+01, 8.296454620361328e+01, 8.296454620361328e+01]
+heaPum.COP_nominal=[3.156724214553833e+00, 3.156724214553833e+00]
+heaPum.port_a2.m_flow=[4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 4.777190208435059e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.409015774726868e-01, 9.409015774726868e-01, 9.409015774726868e-01, 9.409015774726868e-01, 9.409015774726868e-01, 9.409015774726868e-01, 9.409015774726868e-01, 9.409015774726868e-01, 9.409015774726868e-01, 9.409015774726868e-01, 9.409015774726868e-01, 9.409015774726868e-01, 9.409015774726868e-01, 9.409015774726868e-01, 9.409015774726868e-01, 9.409015774726868e-01]
+heaPum.port_b2.m_flow=[-4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, -4.777190208435059e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -9.409015774726868e-01, -9.409015774726868e-01, -9.409015774726868e-01, -9.409015774726868e-01, -9.409015774726868e-01, -9.409015774726868e-01, -9.409015774726868e-01, -9.409015774726868e-01, -9.409015774726868e-01, -9.409015774726868e-01, -9.409015774726868e-01, -9.409015774726868e-01, -9.409015774726868e-01, -9.409015774726868e-01, -9.409015774726868e-01, -9.409015774726868e-01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Validation_Carnot_TCon_etaPL.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Validation_Carnot_TCon_etaPL.txt
new file mode 100644
index 00000000..21c16353
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Validation_Carnot_TCon_etaPL.txt
@@ -0,0 +1,26 @@
+last-generated=2017-06-16
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": " "
+}
+heaPum.TSet=[2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.041499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02]
+heaPum.sta_b1.T=[2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.041499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02]
+heaPum.sta_a2.T=[2.881499938964844e+02, 2.881499938964844e+02]
+heaPum.sta_b2.T=[2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02]
+time=[0e+00, 3.6e+03]
+heaPum.sta_a1.T=[2.931499938964844e+02, 2.931499938964844e+02]
+heaPum.QEva_flow=[-3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -3.86188984375e+04, -7.9986890625e+04, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05, -1.0607915625e+05]
+heaPum.QCon_flow=[4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 4.98095234375e+04, 1.09580953125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05, 1.49428578125e+05]
+heaPum.P=[1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 1.1190625e+04, 2.9594060546875e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04, 4.33494140625e+04]
+heaPum.dp1=[6e+03, 6e+03]
+heaPum.dp2=[1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 1.917057250976562e+03, 8.2238076171875e+03, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04, 1.4464234375e+04]
+heaPum.COP=[4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 4.451004981994629e+00, 3.702802181243896e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00, 3.447072505950928e+00]
+heaPum.COP_nominal=[3.156724214553833e+00, 3.156724214553833e+00]
+heaPum.etaPL=[8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 8.494285941123962e-01, 1.028742909431458e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00, 1.148285746574402e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Validation_Carnot_TCon_reverseFlow.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Validation_Carnot_TCon_reverseFlow.txt
new file mode 100644
index 00000000..4d536e5d
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Validation_Carnot_TCon_reverseFlow.txt
@@ -0,0 +1,25 @@
+last-generated=2017-06-16
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": " "
+}
+heaPum.TSet=[3.131499938964844e+02, 3.131499938964844e+02]
+heaPum.sta_b1.T=[3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+heaPum.sta_a2.T=[2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+heaPum.sta_b2.T=[2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.781499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02]
+time=[0e+00, 3.6e+03]
+heaPum.sta_a1.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+heaPum.QEva_flow=[-1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, -1.10805578125e+05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+heaPum.QCon_flow=[1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 1.9923809375e+05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+heaPum.P=[8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 8.84325234375e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+heaPum.dp1=[6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, 6e+03, -2.4e+02, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03]
+heaPum.dp2=[1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 1.5781873046875e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+heaPum.COP=[2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 2.252995729446411e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00, 3.757800102233887e+00]
+heaPum.COP_nominal=[3.156724214553833e+00, 3.156724214553833e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Validation_Carnot_y_etaCar.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Validation_Carnot_y_etaCar.txt
new file mode 100644
index 00000000..6978283b
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Validation_Carnot_y_etaCar.txt
@@ -0,0 +1,20 @@
+last-generated=2017-06-16
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "number of continuous time states": "2",
+ "linear": " "
+}
+heaPum.sta_a1.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.951499938964844e+02, 3.011499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
+heaPum.sta_b2.T=[2.931499938964844e+02, 2.836461791992188e+02, 2.808143005371094e+02, 2.799302978515625e+02, 2.79929443359375e+02, 2.801734313964844e+02, 2.804001770019531e+02, 2.805618591308594e+02, 2.806659240722656e+02, 2.807294006347656e+02, 2.807669067382812e+02, 2.807886352539062e+02, 2.808009948730469e+02, 2.808079833984375e+02, 2.808119201660156e+02, 2.808140869140625e+02, 2.808153076171875e+02, 2.808159790039062e+02, 2.808163452148438e+02, 2.808165588378906e+02, 2.808166809082031e+02, 2.808167419433594e+02, 2.808167724609375e+02, 2.808168029785156e+02, 2.808168029785156e+02, 2.808168029785156e+02, 2.822386474609375e+02, 2.852433166503906e+02, 2.870902709960938e+02, 2.8796484375e+02, 2.883900451660156e+02, 2.886024780273438e+02, 2.887111511230469e+02, 2.88767822265625e+02, 2.887977905273438e+02, 2.888138122558594e+02, 2.888224792480469e+02, 2.888271484375e+02, 2.888297119140625e+02, 2.888310852050781e+02, 2.888318481445312e+02, 2.88832275390625e+02, 2.888324890136719e+02, 2.888326110839844e+02, 2.888327026367188e+02, 2.888327331542969e+02, 2.888327331542969e+02, 2.88832763671875e+02, 2.88832763671875e+02, 2.88832763671875e+02, 2.88832763671875e+02, 2.899978942871094e+02, 2.930479125976562e+02, 2.953499450683594e+02, 2.966133117675781e+02, 2.97306640625e+02, 2.976871643066406e+02, 2.978959655761719e+02, 2.980105895996094e+02, 2.98073486328125e+02, 2.981080017089844e+02, 2.98126953125e+02, 2.981373596191406e+02, 2.981430358886719e+02, 2.981461791992188e+02, 2.981478881835938e+02, 2.981488342285156e+02, 2.981493530273438e+02, 2.98149658203125e+02, 2.981498107910156e+02, 2.9814990234375e+02, 2.981499328613281e+02, 2.981499633789062e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
+heaPum.sta_a2.T=[2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.941499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
+heaPum.sta_b1.T=[2.931499938964844e+02, 2.999418640136719e+02, 3.018700256347656e+02, 3.045729370117188e+02, 3.076566772460938e+02, 3.092628173828125e+02, 3.100669250488281e+02, 3.104772033691406e+02, 3.106895751953125e+02, 3.108008117675781e+02, 3.108596496582031e+02, 3.108909912109375e+02, 3.109078063964844e+02, 3.109169006347656e+02, 3.109217834472656e+02, 3.109244384765625e+02, 3.109259033203125e+02, 3.109266967773438e+02, 3.109271240234375e+02, 3.109273681640625e+02, 3.10927490234375e+02, 3.109275817871094e+02, 3.109276123046875e+02, 3.109276428222656e+02, 3.109276428222656e+02, 3.109276428222656e+02, 3.109828796386719e+02, 3.112594299316406e+02, 3.116661987304688e+02, 3.120053100585938e+02, 3.12237060546875e+02, 3.123816833496094e+02, 3.124676513671875e+02, 3.125173034667969e+02, 3.125455017089844e+02, 3.125613098144531e+02, 3.125701293945312e+02, 3.125750122070312e+02, 3.125776977539062e+02, 3.125791931152344e+02, 3.125800170898438e+02, 3.125804748535156e+02, 3.125807189941406e+02, 3.125808410644531e+02, 3.125809326171875e+02, 3.125809631347656e+02, 3.125809936523438e+02, 3.125809936523438e+02, 3.125810241699219e+02, 3.125810241699219e+02, 3.125810241699219e+02, 3.113620910644531e+02, 3.082642822265625e+02, 3.059567565917969e+02, 3.046903686523438e+02, 3.039953918457031e+02, 3.036139526367188e+02, 3.034046325683594e+02, 3.032897338867188e+02, 3.032266845703125e+02, 3.031920776367188e+02, 3.03173095703125e+02, 3.031626892089844e+02, 3.03156982421875e+02, 3.031538391113281e+02, 3.03152099609375e+02, 3.031511535644531e+02, 3.03150634765625e+02, 3.031503601074219e+02, 3.031501770019531e+02, 3.031501159667969e+02, 3.031500549316406e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
+time=[0e+00, 3.6e+03]
+heaPum.QEva_flow=[-1.3454534375e+05, -6.090707421875e+04, -5.000755078125e+04, -4.378130859375e+04, -3.94442734375e+04, -3.77781796875e+04, -3.712353515625e+04, -3.685631640625e+04, -3.6745515625e+04, -3.669928125e+04, -3.667991796875e+04, -3.6671796875e+04, -3.6668390625e+04, -3.66669609375e+04, -3.6666359375e+04, -3.666611328125e+04, -3.666600390625e+04, -3.666595703125e+04, -3.666594140625e+04, -3.66659296875e+04, -3.666592578125e+04, -3.666592578125e+04, -3.666592578125e+04, -3.666592578125e+04, -3.666592578125e+04, -3.666592578125e+04, -3.84876953125e+04, -4.255473046875001e+04, -4.499070703125001e+04, -4.59752421875e+04, -4.635515625e+04, -4.6499203125e+04, -4.655346875e+04, -4.657386328125e+04, -4.65815078125e+04, -4.658438671875e+04, -4.658547265625e+04, -4.65858828125e+04, -4.658603515625e+04, -4.658609375e+04, -4.65861171875e+04, -4.658612109375e+04, -4.6586125e+04, -4.658612890625e+04, -4.658612890625e+04, -4.658612890625e+04, -4.658612890625e+04, -4.658612890625e+04, -4.658612890625e+04, -4.658612890625e+04, -4.658612890625e+04, -2.268343359375e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+heaPum.QCon_flow=[1.4454534375e+05, 7.0907078125e+04, 6.000755078125e+04, 5.378130859375e+04, 4.94442734375e+04, 4.77781796875e+04, 4.712353515625e+04, 4.685631640625e+04, 4.6745515625e+04, 4.669928125e+04, 4.667991796875e+04, 4.6671796875e+04, 4.6668390625e+04, 4.66669609375e+04, 4.6666359375e+04, 4.666611328125e+04, 4.666600390625e+04, 4.666595703125e+04, 4.666594140625e+04, 4.66659296875e+04, 4.666592578125e+04, 4.666592578125e+04, 4.666592578125e+04, 4.666592578125e+04, 4.666592578125e+04, 4.666592578125e+04, 4.84876953125e+04, 5.255473046875001e+04, 5.499070703125001e+04, 5.59752421875e+04, 5.635515625e+04, 5.6499203125e+04, 5.655346875e+04, 5.657386328125e+04, 5.65815078125e+04, 5.658438671875e+04, 5.658547265625e+04, 5.65858828125e+04, 5.658603515625e+04, 5.658609375e+04, 5.65861171875e+04, 5.658612109375e+04, 5.6586125e+04, 5.658612890625e+04, 5.658612890625e+04, 5.658612890625e+04, 5.658612890625e+04, 5.658612890625e+04, 5.658612890625e+04, 5.658612890625e+04, 5.658612890625e+04, 2.668343359375e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+heaPum.P=[1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 4e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+heaPum.dp1=[6e+03, 6e+03]
+heaPum.dp2=[6e+03, 6e+03]
+heaPum.COP=[1.445453453063965e+01, 7.090707302093506e+00, 6.000755310058594e+00, 5.378130912780762e+00, 4.944427013397217e+00, 4.777817726135254e+00, 4.712353229522705e+00, 4.685631275177002e+00, 4.674551486968994e+00, 4.669928073883057e+00, 4.667991638183594e+00, 4.667179584503174e+00, 4.666839122772217e+00, 4.666696071624756e+00, 4.666635990142822e+00, 4.666611194610596e+00, 4.666600227355957e+00, 4.666595935821533e+00, 4.6665940284729e+00, 4.666593074798584e+00, 4.666592597961426e+00, 4.666592597961426e+00, 4.666592597961426e+00, 4.666592597961426e+00, 4.666592597961426e+00, 4.666592597961426e+00, 4.848769187927246e+00, 5.255473136901856e+00, 5.499070644378662e+00, 5.597524166107178e+00, 5.635515689849854e+00, 5.649920463562012e+00, 5.655346870422363e+00, 5.657386302947998e+00, 5.658150672912598e+00, 5.658438682556152e+00, 5.658547401428223e+00, 5.658588409423828e+00, 5.658603668212891e+00, 5.658609390258789e+00, 5.65861177444458e+00, 5.658612251281738e+00, 5.658612728118896e+00, 5.658612728118896e+00, 5.658612728118896e+00, 5.658612728118896e+00, 5.658612728118896e+00, 5.658612728118896e+00, 5.658612728118896e+00, 5.658612728118896e+00, 5.658612728118896e+00, 6.670858383178711e+00, 1.002412891387939e+01, 1.427280902862549e+01, 1.866555786132815e+01, 2.248831367492678e+01, 2.534748458862306e+01, 2.72527961730957e+01, 2.842674827575684e+01, 2.911547660827637e+01, 2.950796890258789e+01, 2.972794342041016e+01, 2.985000801086426e+01, 2.991740989685059e+01, 2.995458793640137e+01, 2.997504615783691e+01, 2.998629570007324e+01, 2.999248313903809e+01, 2.999588203430176e+01, 2.999774932861328e+01, 2.999876403808594e+01, 2.999930763244629e+01, 2.999962997436523e+01, 2.999983406066895e+01, 2.999992942810059e+01, 2.999998664855957e+01, 3.000001335144043e+01, 3.000002479553223e+01, 3.000003433227539e+01, 3.000003814697266e+01, 3.000003814697266e+01, 3.000003623962402e+01, 3.000003623962402e+01, 3.000003433227539e+01, 3.000003242492676e+01, 3.000003051757812e+01, 3.000003051757812e+01, 3.000002861022949e+01, 3.000002861022949e+01, 3.000002861022949e+01, 3.000002861022949e+01, 3.000002861022949e+01, 3.000002861022949e+01, 3.000002861022949e+01, 3.000002861022949e+01, 3.000002861022949e+01, 3.000002670288086e+01, 3.000002670288086e+01, 3.000002670288086e+01, 3.000002670288086e+01, 3.000002670288086e+01]
+heaPum.COP_nominal=[6e+00, 6e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Validation_Carnot_y_etaPL.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Validation_Carnot_y_etaPL.txt
new file mode 100644
index 00000000..1f5825ea
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_HeatPumps_Validation_Carnot_y_etaPL.txt
@@ -0,0 +1,21 @@
+last-generated=2017-06-16
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "number of continuous time states": "2",
+ "linear": " "
+}
+heaPum.sta_a1.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.951499938964844e+02, 3.011499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
+heaPum.sta_b2.T=[2.781499938964844e+02, 2.781499938964844e+02, 2.781551208496094e+02, 2.783628234863281e+02, 2.788809509277344e+02, 2.793918151855469e+02, 2.797519836425781e+02, 2.799791564941406e+02, 2.80114990234375e+02, 2.801937866210938e+02, 2.802386779785156e+02, 2.80263916015625e+02, 2.802780151367188e+02, 2.802858581542969e+02, 2.802901916503906e+02, 2.802925720214844e+02, 2.802938842773438e+02, 2.802946166992188e+02, 2.802950134277344e+02, 2.802952270507812e+02, 2.802953491210938e+02, 2.8029541015625e+02, 2.802954711914062e+02, 2.802954711914062e+02, 2.802955017089844e+02, 2.802955017089844e+02, 2.816965942382812e+02, 2.846029052734375e+02, 2.863229675292969e+02, 2.871134948730469e+02, 2.874947509765625e+02, 2.876865539550781e+02, 2.877861328125e+02, 2.878388977050781e+02, 2.878672485351562e+02, 2.878825988769531e+02, 2.878909606933594e+02, 2.878955383300781e+02, 2.878980407714844e+02, 2.878994140625e+02, 2.879001770019531e+02, 2.879005737304688e+02, 2.879007873535156e+02, 2.879009399414062e+02, 2.879010009765625e+02, 2.879010314941406e+02, 2.879010620117188e+02, 2.879010620117188e+02, 2.879010620117188e+02, 2.879010925292969e+02, 2.879010925292969e+02, 2.89492919921875e+02, 2.928611145019531e+02, 2.952474365234375e+02, 2.965570678710938e+02, 2.972757568359375e+02, 2.976701965332031e+02, 2.978866882324219e+02, 2.980054931640625e+02, 2.980706787109375e+02, 2.981064758300781e+02, 2.981260986328125e+02, 2.981368713378906e+02, 2.981427917480469e+02, 2.981460266113281e+02, 2.981478271484375e+02, 2.981488037109375e+02, 2.981493530273438e+02, 2.981496276855469e+02, 2.981498107910156e+02, 2.9814990234375e+02, 2.981499328613281e+02, 2.981499633789062e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
+heaPum.sta_a2.T=[2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.941499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
+heaPum.sta_b1.T=[3.031499938964844e+02, 3.031499938964844e+02, 3.033330383300781e+02, 3.054659423828125e+02, 3.083036499023438e+02, 3.097897338867188e+02, 3.105387878417969e+02, 3.1092529296875e+02, 3.111281127929688e+02, 3.112358703613281e+02, 3.112936401367188e+02, 3.113248596191406e+02, 3.113417663574219e+02, 3.113509826660156e+02, 3.113560180664062e+02, 3.113587646484375e+02, 3.113602600097656e+02, 3.11361083984375e+02, 3.113615417480469e+02, 3.113617858886719e+02, 3.113619079589844e+02, 3.113619995117188e+02, 3.113620300292969e+02, 3.11362060546875e+02, 3.11362060546875e+02, 3.11362060546875e+02, 3.114346008300781e+02, 3.117931213378906e+02, 3.123056335449219e+02, 3.127147827148438e+02, 3.12983154296875e+02, 3.131449584960938e+02, 3.132384948730469e+02, 3.132914123535156e+02, 3.133209533691406e+02, 3.133373413085938e+02, 3.133463745117188e+02, 3.133513488769531e+02, 3.133540954589844e+02, 3.133555908203125e+02, 3.133564147949219e+02, 3.133568725585938e+02, 3.133571166992188e+02, 3.133572692871094e+02, 3.133573303222656e+02, 3.133573913574219e+02, 3.133573913574219e+02, 3.13357421875e+02, 3.13357421875e+02, 3.13357421875e+02, 3.13357421875e+02, 3.117828979492188e+02, 3.084199523925781e+02, 3.060421752929688e+02, 3.047372436523438e+02, 3.040211181640625e+02, 3.036280822753906e+02, 3.034123840332031e+02, 3.032940063476562e+02, 3.032290344238281e+02, 3.03193359375e+02, 3.031737976074219e+02, 3.031630859375e+02, 3.031571960449219e+02, 3.031539306640625e+02, 3.031521606445312e+02, 3.031511840820312e+02, 3.031506652832031e+02, 3.031503601074219e+02, 3.031502075195312e+02, 3.031501159667969e+02, 3.031500549316406e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031500244140625e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
+time=[0e+00, 3.6e+03]
+heaPum.QEva_flow=[-5e+04, -5e+04, -4.9609359375e+04, -4.569354296875e+04, -4.162604296875e+04, -4.013903515625e+04, -3.959966796875e+04, -3.939721484375e+04, -3.932022265625e+04, -3.9290796875e+04, -3.9279515625e+04, -3.927518359375e+04, -3.92735234375e+04, -3.92728828125e+04, -3.9272640625e+04, -3.9272546875e+04, -3.92725078125e+04, -3.92724921875e+04, -3.927248828125e+04, -3.927248828125e+04, -3.927248828125e+04, -3.9272484375e+04, -3.9272484375e+04, -3.9272484375e+04, -3.9272484375e+04, -3.9272484375e+04, -4.16558203125e+04, -4.686853515625001e+04, -4.973217187500001e+04, -5.074165234375e+04, -5.107943359375e+04, -5.11905703125e+04, -5.122694140625e+04, -5.1238828125e+04, -5.124269921875e+04, -5.124397265625e+04, -5.1244390625e+04, -5.124452734375e+04, -5.124457421875e+04, -5.124458984375e+04, -5.124459375e+04, -5.124459375e+04, -5.124459375e+04, -5.124459375e+04, -5.124459375e+04, -5.124459375e+04, -5.124459375e+04, -5.124459375e+04, -5.124459765625e+04, -5.124459765625e+04, -5.124459765625e+04, -2.0510513671875e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+heaPum.QCon_flow=[6e+04, 6e+04, 5.9609359375e+04, 5.569354296875e+04, 5.162604296875e+04, 5.013903515625e+04, 4.959966796875e+04, 4.939721484375e+04, 4.932022265625e+04, 4.9290796875e+04, 4.9279515625e+04, 4.927518359375e+04, 4.92735234375e+04, 4.92728828125e+04, 4.9272640625e+04, 4.9272546875e+04, 4.92725078125e+04, 4.92724921875e+04, 4.927248828125e+04, 4.927248828125e+04, 4.927248828125e+04, 4.9272484375e+04, 4.9272484375e+04, 4.9272484375e+04, 4.9272484375e+04, 4.9272484375e+04, 5.16558203125e+04, 5.686853515625001e+04, 5.973217187500001e+04, 6.074165234375e+04, 6.107943359375e+04, 6.11905703125e+04, 6.122694140625e+04, 6.1238828125e+04, 6.124269921875e+04, 6.124397265625e+04, 6.1244390625e+04, 6.124452734375e+04, 6.124457421875e+04, 6.124458984375e+04, 6.124459375e+04, 6.124459375e+04, 6.124459375e+04, 6.124459375e+04, 6.124459375e+04, 6.124459375e+04, 6.124459375e+04, 6.124459375e+04, 6.124459765625e+04, 6.124459765625e+04, 6.124459765625e+04, 2.4510513671875e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+heaPum.P=[1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 4e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+heaPum.dp1=[6e+03, 6e+03]
+heaPum.dp2=[6e+03, 6e+03]
+heaPum.COP=[6e+00, 6e+00, 5.960936069488525e+00, 5.569354057312012e+00, 5.162604331970215e+00, 5.013903617858887e+00, 4.959966659545898e+00, 4.939721584320068e+00, 4.932022571563721e+00, 4.929079532623291e+00, 4.927951335906982e+00, 4.927518367767334e+00, 4.927352428436279e+00, 4.92728853225708e+00, 4.927263736724854e+00, 4.927254676818848e+00, 4.927250862121582e+00, 4.927249431610107e+00, 4.927248954772949e+00, 4.927248477935791e+00, 4.927248477935791e+00, 4.927248477935791e+00, 4.927248477935791e+00, 4.927248477935791e+00, 4.927248477935791e+00, 4.927248477935791e+00, 5.165582180023193e+00, 5.686853408813477e+00, 5.973217010498048e+00, 6.074165344238281e+00, 6.107943534851074e+00, 6.119056701660156e+00, 6.12269401550293e+00, 6.12388277053833e+00, 6.124269962310791e+00, 6.124397277832031e+00, 6.124439239501953e+00, 6.124453067779541e+00, 6.124457359313965e+00, 6.124458789825439e+00, 6.124459266662598e+00, 6.124459266662598e+00, 6.124459266662598e+00, 6.124459743499756e+00, 6.124459743499756e+00, 6.124459743499756e+00, 6.124459743499756e+00, 6.124459743499756e+00, 6.124459743499756e+00, 6.124459743499756e+00, 6.124459743499756e+00, 6.127628326416016e+00, 7.912235736846924e+00, 1.131624031066895e+01, 1.486948394775393e+01, 1.799006843566896e+01, 2.034153556823732e+01, 2.191691780090332e+01, 2.289094543457031e+01, 2.346358299255371e+01, 2.379031562805176e+01, 2.397355079650879e+01, 2.407526206970215e+01, 2.413147163391113e+01, 2.416246795654297e+01, 2.417951965332031e+01, 2.418889999389648e+01, 2.419405555725098e+01, 2.41968879699707e+01, 2.419844436645508e+01, 2.419929122924805e+01, 2.419974517822266e+01, 2.419999313354492e+01, 2.420014190673828e+01, 2.420023727416992e+01, 2.420029258728027e+01, 2.42003173828125e+01, 2.42003288269043e+01, 2.420033073425293e+01, 2.42003231048584e+01, 2.42003116607666e+01, 2.420030212402344e+01, 2.420029830932617e+01, 2.420029830932617e+01, 2.42003002166748e+01, 2.420030784606934e+01, 2.420031547546387e+01, 2.420032119750977e+01, 2.42003231048584e+01, 2.420032501220703e+01, 2.420032691955566e+01, 2.420033073425293e+01, 2.420033264160156e+01, 2.42003345489502e+01, 2.420033645629883e+01, 2.420033836364746e+01, 2.420033836364746e+01, 2.420033836364746e+01, 2.420033836364746e+01, 2.420034027099609e+01, 2.420034027099609e+01]
+heaPum.COP_nominal=[6e+00, 6e+00]
+heaPum.etaPL=[1e+00, 1e+00, 9.980468153953552e-01, 9.784677028656006e-01, 9.581302404403687e-01, 9.506951570510864e-01, 9.479983448982239e-01, 9.469860792160034e-01, 9.466010928153992e-01, 9.464539885520935e-01, 9.463975429534912e-01, 9.463759064674377e-01, 9.46367621421814e-01, 9.463644027709961e-01, 9.463632106781006e-01, 9.463627338409424e-01, 9.463625550270081e-01, 9.463624954223633e-01, 9.463624358177185e-01, 9.463624358177185e-01, 9.463624358177185e-01, 9.463624358177185e-01, 9.463624358177185e-01, 9.463624358177185e-01, 9.463624358177185e-01, 9.463624358177185e-01, 9.582791328430176e-01, 9.843426942825318e-01, 9.986608624458313e-01, 1.003708243370056e+00, 1.005397200584412e+00, 1.005952835083008e+00, 1.006134748458862e+00, 1.006194114685059e+00, 1.006213545799255e+00, 1.006219863891602e+00, 1.006222009658813e+00, 1.006222605705261e+00, 1.00622284412384e+00, 1.00622296333313e+00, 1.00622296333313e+00, 1.00622296333313e+00, 1.00622296333313e+00, 1.00622296333313e+00, 1.00622296333313e+00, 1.00622296333313e+00, 1.00622296333313e+00, 1.00622296333313e+00, 1.00622296333313e+00, 1.00622296333313e+00, 1.00622296333313e+00, 8.225525617599487e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Humidifiers_Examples_Humidifier_u.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Humidifiers_Examples_Humidifier_u.txt
deleted file mode 100644
index 89037731..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Humidifiers_Examples_Humidifier_u.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-last-generated=2017-04-25
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "6",
- "linear": " "
-}
-con2.u_m=[2.931499938964844e+02, 3.03138671875e+02, 3.031282958984375e+02, 3.031324157714844e+02, 3.0313818359375e+02, 3.0314208984375e+02, 3.031446838378906e+02, 3.031464538574219e+02, 3.031476135253906e+02, 3.031484069824219e+02, 3.0314892578125e+02, 3.006927490234375e+02, 2.985893249511719e+02, 2.975452575683594e+02, 2.973494262695312e+02, 2.975818481445312e+02, 2.979009094238281e+02, 2.981309509277344e+02, 2.982339477539062e+02, 2.982437744140625e+02, 2.982110900878906e+02, 2.981734924316406e+02, 2.981488037109375e+02, 2.981390380859375e+02, 2.981390991210938e+02, 2.981435241699219e+02, 2.981478576660156e+02, 2.981505126953125e+02, 2.981513366699219e+02, 2.981512756347656e+02, 2.981507568359375e+02, 2.981501770019531e+02, 2.9814990234375e+02, 2.981498107910156e+02, 2.981498413085938e+02, 2.981499328613281e+02, 2.981499938964844e+02, 2.981500244140625e+02, 2.981500244140625e+02, 2.981500244140625e+02, 2.981500244140625e+02, 2.981500244140625e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
-con1.u_m=[2.931499938964844e+02, 3.031156005859375e+02, 3.031387329101562e+02, 3.031463317871094e+02, 3.031488037109375e+02, 3.031495971679688e+02, 3.031498718261719e+02, 3.031499633789062e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.982659301757812e+02, 2.981878662109375e+02, 2.981623840332031e+02, 2.98154052734375e+02, 2.981513366699219e+02, 2.981504211425781e+02, 2.98150146484375e+02, 2.981500549316406e+02, 2.981500244140625e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
-con1.u_s=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
-time=[0e+00, 1.2e+03]
-con2.y=[0e+00, 4.956065211445093e-03, 1.739036059007049e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.178712487220764e-01, 6.764557957649231e-01, 5.518112182617188e-01, 4.414711594581602e-01, 3.803164660930634e-01, 3.635183274745941e-01, 3.717216849327088e-01, 3.870892822742462e-01, 3.993788659572601e-01, 4.056026339530945e-01, 4.068471491336823e-01, 4.055639505386353e-01, 4.036989808082581e-01, 4.0237957239151e-01, 4.017342627048492e-01, 4.016669392585754e-01, 4.018551111221313e-01, 4.020771384239197e-01, 4.022149443626404e-01, 4.022801220417023e-01, 4.022873938083649e-01, 4.022579491138458e-01, 4.022325873374939e-01, 4.022155106067657e-01, 4.022077620029449e-01, 4.02209997177124e-01, 4.022133052349091e-01, 4.02215838432312e-01, 4.022176265716553e-01, 4.02218759059906e-01, 4.022192656993866e-01, 4.022192358970642e-01, 4.022187292575836e-01, 4.022180438041687e-01, 4.02217835187912e-01, 4.022176563739777e-01, 4.022175669670105e-01, 4.022175073623657e-01, 4.022175073623657e-01, 4.022175371646881e-01, 4.022175967693329e-01, 4.022176563739777e-01, 4.022177457809448e-01, 4.02217835187912e-01, 4.022178947925568e-01, 4.022179841995239e-01, 4.022180140018463e-01, 4.022180140018463e-01, 4.022179841995239e-01, 4.022179245948792e-01, 4.022178947925568e-01, 4.022178649902344e-01, 4.022178649902344e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.022178053855896e-01, 4.022178053855896e-01, 4.022178053855896e-01, 4.022178053855896e-01, 4.022178053855896e-01, 4.022178053855896e-01, 4.022178053855896e-01, 4.022178053855896e-01, 4.022178053855896e-01, 4.022178053855896e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.022178649902344e-01, 4.022178649902344e-01, 4.022178649902344e-01, 4.022178649902344e-01, 4.022178649902344e-01, 4.022178649902344e-01, 4.022178649902344e-01, 4.022178649902344e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.022178053855896e-01, 4.022178053855896e-01, 4.022178053855896e-01]
-con1.y=[0e+00, 2.505040261894464e-03, 8.198181167244911e-04, 2.678276796359569e-04, 8.753060683375224e-05, 2.908469832618721e-05, 3.173016921209637e-06, 3.113440016022647e-06, 1.017051090457244e-06, 3.799722492203728e-07, 0e+00, 3.937473893165588e-01, 3.994515240192413e-01, 4.013130366802216e-01, 4.019219279289246e-01, 4.021211862564087e-01, 4.021862745285034e-01, 4.022075235843658e-01, 4.022144377231598e-01, 4.022167325019836e-01, 4.022174775600433e-01, 4.022177159786224e-01, 4.022178053855896e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01, 4.02217835187912e-01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Humidifiers_Validation_SprayAirWasher_X.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Humidifiers_Validation_SprayAirWasher_X.txt
deleted file mode 100644
index 265529ec..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Humidifiers_Validation_SprayAirWasher_X.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-last-generated=2017-05-10
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-XSet.y[1]=[9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03]
-senHum.X=[1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02]
-time=[0e+00, 1.08e+03]
-hum.sta_a.T=[2.931499938964844e+02, 2.931499938964844e+02]
-hum.sta_b.T=[2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.882766723632812e+02, 2.882766723632812e+02, 2.882766723632812e+02, 2.882766723632812e+02, 2.882766723632812e+02, 2.882766723632812e+02, 2.882766723632812e+02, 2.882766723632812e+02, 2.882766723632812e+02, 2.882766723632812e+02, 2.882766723632812e+02, 2.882766723632812e+02, 2.882766723632812e+02, 2.882766723632812e+02, 2.882766723632812e+02, 2.882766723632812e+02, 2.882766723632812e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02]
-hum.mWat_flow=[1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Humidifiers_Validation_SprayAirWasher_X_dynamic.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Humidifiers_Validation_SprayAirWasher_X_dynamic.txt
deleted file mode 100644
index 2189d727..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Humidifiers_Validation_SprayAirWasher_X_dynamic.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2017-05-10
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "1",
- "linear": " "
-}
-XSet.y[1]=[9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03]
-senHum.X=[1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.060534266539954e-02, 1.152623936488769e-02, 1.183950626049027e-02, 1.194559223949909e-02, 1.198126840707923e-02, 1.19938477829617e-02, 1.199795771502307e-02, 1.199935842198051e-02, 1.199995446950197e-02, 1.200011651961943e-02, 1.200007088487117e-02, 1.19999712332741e-02, 1.199993584310838e-02, 1.199991442263126e-02, 1.199993491174369e-02, 1.199995726345391e-02, 1.199998054654459e-02, 1.354040006752835e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.169755961553871e-02, 1.057627111798619e-02, 1.019598876335849e-02, 1.006658384330649e-02, 1.002262812107801e-02, 1.000779773233662e-02, 1.000308058575937e-02, 1.000106148749135e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02]
-time=[0e+00, 1.08e+03]
-hum.sta_a.T=[2.931499938964844e+02, 2.931499938964844e+02]
-hum.sta_b.T=[2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.916732506131955e+02, 2.894295953135362e+02, 2.886671446679869e+02, 2.884090270996094e+02, 2.883222351227283e+02, 2.882916259873417e+02, 2.882816467257562e+02, 2.882782287623526e+02, 2.882767944335938e+02, 2.882763977050781e+02, 2.882764892577263e+02, 2.882767333985237e+02, 2.882768249509994e+02, 2.882768859863281e+02, 2.882768249511719e+02, 2.882767639161019e+02, 2.882767333983513e+02, 2.845343981335823e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.83422119140625e+02, 2.890125777814509e+02, 2.917441437107333e+02, 2.926717211117277e+02, 2.929874875716969e+02, 2.930947570800781e+02, 2.931309814649734e+02, 2.931424865864077e+02, 2.931473998944104e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02, 2.931475524902344e+02]
-hum.mWat_flow=[1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 6.053423504982561e-05, 1.526239326469566e-04, 1.839506047450805e-04, 1.945591939147562e-04, 1.981268281351049e-04, 1.993848122892633e-04, 1.997958171370559e-04, 1.999358645494311e-04, 1.999954838538542e-04, 2.000116801342698e-04, 2.000070380793154e-04, 1.999971718723611e-04, 1.99993577559045e-04, 1.999914238695055e-04, 1.999934611393645e-04, 1.999957457866014e-04, 1.999980158881731e-04, 3.540399534351435e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 1.697559809949835e-04, 5.762709485991012e-05, 1.959887285800291e-05, 6.658384763353706e-06, 2.262776433781255e-06, 7.797840349258192e-07, 3.080973440389264e-07, 1.06108680452693e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Humidifiers_Validation_SteamHumidifier_X.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Humidifiers_Validation_SteamHumidifier_X.txt
deleted file mode 100644
index 06f8f7c4..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Humidifiers_Validation_SteamHumidifier_X.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-last-generated=2017-05-10
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-XSet.y[1]=[9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03]
-senHum.X=[1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02]
-time=[0e+00, 1.08e+03]
-hum.sta_a.T=[2.931499938964844e+02, 2.931499938964844e+02]
-hum.sta_b.T=[2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.934824523925781e+02, 2.934824523925781e+02, 2.934824523925781e+02, 2.934824523925781e+02, 2.934824523925781e+02, 2.934824523925781e+02, 2.934824523925781e+02, 2.934824523925781e+02, 2.934824523925781e+02, 2.934824523925781e+02, 2.934824523925781e+02, 2.934824523925781e+02, 2.934824523925781e+02, 2.934824523925781e+02, 2.934824523925781e+02, 2.934824523925781e+02, 2.934824523925781e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02]
-hum.mWat_flow=[1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Humidifiers_Validation_SteamHumidifier_X_dynamic.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Humidifiers_Validation_SteamHumidifier_X_dynamic.txt
deleted file mode 100644
index 38d40dc3..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Humidifiers_Validation_SteamHumidifier_X_dynamic.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2017-05-10
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "1",
- "linear": " "
-}
-XSet.y[1]=[9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03]
-senHum.X=[1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.060534266539954e-02, 1.152623936488769e-02, 1.183950626049027e-02, 1.194559223949909e-02, 1.198126840707923e-02, 1.19938477829617e-02, 1.199795771502307e-02, 1.199935842198051e-02, 1.199995446950197e-02, 1.200011651961943e-02, 1.200007088487117e-02, 1.19999712332741e-02, 1.199993584310838e-02, 1.199991442263126e-02, 1.199993491174369e-02, 1.199995726345391e-02, 1.199998054654459e-02, 1.354040006752835e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.399900019168854e-02, 1.169755961553871e-02, 1.057627111798619e-02, 1.019598876335849e-02, 1.006658384330649e-02, 1.002262812107801e-02, 1.000779773233662e-02, 1.000308058575937e-02, 1.000106148749135e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02, 1.000100001692772e-02]
-time=[0e+00, 1.08e+03]
-hum.sta_a.T=[2.931499938964844e+02, 2.931499938964844e+02]
-hum.sta_b.T=[2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.932507322634642e+02, 2.93403778119461e+02, 2.934558105542048e+02, 2.934734191894531e+02, 2.934793395985746e+02, 2.93481414794232e+02, 2.934820861818993e+02, 2.934823303220932e+02, 2.93482421875e+02, 2.934824523925781e+02, 2.934824523925781e+02, 2.93482421875e+02, 2.93482421875e+02, 2.93482421875e+02, 2.93482421875e+02, 2.93482421875e+02, 2.93482421875e+02, 2.93737731604527e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.938135986328125e+02, 2.934322506668164e+02, 2.932459104337797e+02, 2.931826172761467e+02, 2.931610717925206e+02, 2.931537780761719e+02, 2.93151306150964e+02, 2.931505126942777e+02, 2.93150177002643e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931501770019531e+02]
-hum.mWat_flow=[1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 6.053423504982561e-05, 1.526239326469566e-04, 1.839506047450805e-04, 1.945591939147562e-04, 1.981268281351049e-04, 1.993848122892633e-04, 1.997958171370559e-04, 1.999358645494311e-04, 1.999954838538542e-04, 2.000116801342698e-04, 2.000070380793154e-04, 1.999971718723611e-04, 1.99993577559045e-04, 1.999914238695055e-04, 1.999934611393645e-04, 1.999957457866014e-04, 1.999980158881731e-04, 3.540399534351435e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 3.998999891337007e-04, 1.697559809949835e-04, 5.762709485991012e-05, 1.959887285800291e-05, 6.658384763353706e-06, 2.262776433781255e-06, 7.797840349258192e-07, 3.080973440389264e-07, 1.06108680452693e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07, 1.000000011686097e-07]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_ConservationEquation.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_ConservationEquation.txt
deleted file mode 100644
index 45b84a14..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_ConservationEquation.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-last-generated=2017-03-31
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "1",
- "linear": " "
-}
-dyn.Q_flow=[-1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, -1e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02]
-time=[0e+00, 3.6e+03]
-dyn.medium.T=[2.931499938964844e+02, 2.930643615722656e+02, 2.92980224609375e+02, 2.928976135253906e+02, 2.928164978027344e+02, 2.9273681640625e+02, 2.926585693359375e+02, 2.925816955566406e+02, 2.925062561035156e+02, 2.9243212890625e+02, 2.923593444824219e+02, 2.922878723144531e+02, 2.922176818847656e+02, 2.921487121582031e+02, 2.920810241699219e+02, 2.920145263671875e+02, 2.9194921875e+02, 2.918851013183594e+02, 2.918221130371094e+02, 2.9176025390625e+02, 2.916994934082031e+02, 2.916398620605469e+02, 2.915812683105469e+02, 2.915237121582031e+02, 2.914672241210938e+02, 2.914117126464844e+02, 2.9144287109375e+02, 2.914734497070312e+02, 2.915034790039062e+02, 2.915329895019531e+02, 2.915619812011719e+02, 2.915904235839844e+02, 2.916183776855469e+02, 2.916458129882812e+02, 2.916727600097656e+02, 2.9169921875e+02, 2.917252197265625e+02, 2.91750732421875e+02, 2.917758178710938e+02, 2.918004455566406e+02, 2.918246154785156e+02, 2.918483581542969e+02, 2.918716735839844e+02, 2.918945922851562e+02, 2.919170837402344e+02, 2.919391784667969e+02, 2.919608459472656e+02, 2.91982177734375e+02, 2.920030822753906e+02, 2.920236511230469e+02, 2.920438232421875e+02, 2.921492919921875e+02, 2.922528686523438e+02, 2.923545837402344e+02, 2.924544982910156e+02, 2.925526123046875e+02, 2.926489562988281e+02, 2.927435913085938e+02, 2.928365173339844e+02, 2.929277954101562e+02, 2.930174255371094e+02, 2.931054382324219e+02, 2.931918640136719e+02, 2.932767639160156e+02, 2.933601379394531e+02, 2.934420471191406e+02, 2.935224609375e+02, 2.936014099121094e+02, 2.936789855957031e+02, 2.937551574707031e+02, 2.938299560546875e+02, 2.939034118652344e+02, 2.939755554199219e+02, 2.940464172363281e+02, 2.941159973144531e+02, 2.941843566894531e+02, 2.9425146484375e+02, 2.943173828125e+02, 2.943821105957031e+02, 2.944456787109375e+02, 2.945081176757812e+02, 2.945694274902344e+02, 2.94629638671875e+02, 2.946887817382812e+02, 2.947468566894531e+02, 2.948038940429688e+02, 2.948598937988281e+02, 2.949149169921875e+02, 2.949689331054688e+02, 2.950220031738281e+02, 2.950740966796875e+02, 2.951252746582031e+02, 2.95175537109375e+02, 2.952248840332031e+02, 2.952733764648438e+02, 2.953209838867188e+02, 2.953677062988281e+02, 2.954136352539062e+02, 2.954587097167969e+02, 2.955029907226562e+02, 2.955464782714844e+02]
-ste.sta_b.T=[2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.88369873046875e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02, 2.979301147460938e+02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_FourPortHeatMassExchanger.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_FourPortHeatMassExchanger.txt
new file mode 100644
index 00000000..48e0b02d
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_FourPortHeatMassExchanger.txt
@@ -0,0 +1,16 @@
+last-generated=2017-03-31
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "2",
+ "linear": " "
+}
+fouPor.Q1_flow=[0e+00, 0e+00]
+fouPor.Q2_flow=[0e+00, 0e+00]
+time=[0e+00, 5e+00]
+sou1.T_in=[2.731499938964844e+02, 2.732499999985107e+02, 2.733500061005325e+02, 2.734500121950987e+02, 2.735499877870116e+02, 2.736499938964844e+02, 2.737499999761713e+02, 2.7385000611543e+02, 2.739500121950987e+02, 2.740499878168338e+02, 2.741499938964844e+02, 2.742499999761712e+02, 2.743500060557856e+02, 2.744500122546885e+02, 2.745499878168339e+02, 2.746499938964844e+02, 2.747499999761712e+02, 2.748500060557856e+02, 2.749500122546885e+02, 2.750499878168339e+02, 2.751499938964844e+02, 2.752500000953152e+02, 2.753500060557853e+02, 2.754500122546888e+02, 2.755499876976536e+02, 2.756499938964844e+02, 2.757500000953152e+02, 2.758500060557853e+02, 2.759500122546888e+02, 2.760499876976536e+02, 2.761499938964844e+02, 2.762500000953152e+02, 2.763500060557853e+02, 2.764500122546888e+02, 2.765499876976536e+02, 2.766499938964844e+02, 2.767500000953152e+02, 2.768500060557853e+02, 2.769500122546888e+02, 2.770499876976536e+02, 2.771499938964844e+02, 2.772500000953152e+02, 2.773500062941459e+02, 2.7745001201611e+02, 2.775499876976536e+02, 2.776499938964844e+02, 2.777500000953152e+02, 2.778500062941459e+02, 2.7795001201611e+02, 2.780499876976536e+02, 2.781499938964844e+02, 2.782500000953152e+02, 2.783500062941459e+02, 2.7845001201611e+02, 2.785499876976536e+02, 2.786499938964844e+02, 2.787500000953152e+02, 2.788500062941459e+02, 2.7895001201611e+02, 2.790499876976536e+02, 2.791499938964844e+02, 2.792500000953152e+02, 2.793500062941459e+02, 2.7945001201611e+02, 2.795499876976536e+02, 2.796499938964844e+02, 2.797500000953152e+02, 2.798500062941459e+02, 2.7995001201611e+02, 2.800499876976536e+02, 2.801499938964844e+02, 2.802500000953152e+02, 2.803500062941459e+02, 2.8045001201611e+02, 2.805499876976536e+02, 2.806499938964844e+02, 2.807500000953152e+02, 2.808500062941459e+02, 2.8095001201611e+02, 2.810499876976536e+02, 2.811499938964844e+02, 2.812499996187486e+02, 2.813500062941413e+02, 2.814500120161145e+02, 2.815499881748023e+02, 2.816499938964844e+02, 2.817499996187486e+02, 2.818500062941413e+02, 2.819500120161145e+02, 2.820499881748023e+02, 2.821499938964844e+02, 2.822499996187486e+02, 2.823500062941413e+02, 2.824500120161145e+02, 2.825499881748023e+02, 2.826499938964844e+02, 2.827499996187486e+02, 2.828500062941413e+02, 2.829500120161145e+02, 2.830499881748023e+02, 2.831499938964844e+02]
+fouPor.vol1.T=[2.931499938964844e+02, 2.921864624162749e+02, 2.912922973891427e+02, 2.9046231088704e+02, 2.896916199176394e+02, 2.889758605957031e+02, 2.883110047925581e+02, 2.876932982694127e+02, 2.871193848320362e+02, 2.865860594486587e+02, 2.860904846191406e+02, 2.856299744718273e+02, 2.85202057082889e+02, 2.848045042131425e+02, 2.844351805798432e+02, 2.840921630859375e+02, 2.837736511967524e+02, 2.834780274805373e+02, 2.83203704708984e+02, 2.829493102448177e+02, 2.827135314941406e+02, 2.824951169887207e+02, 2.822929383258453e+02, 2.821059874637721e+02, 2.819332276985517e+02, 2.817737426757812e+02, 2.816267393686575e+02, 2.814914246229019e+02, 2.813670043382153e+02, 2.812528382399761e+02, 2.811482849121094e+02, 2.810527342887071e+02, 2.809656067293982e+02, 2.808863830210611e+02, 2.808146057786653e+02, 2.807497863769531e+02, 2.806914672330603e+02, 2.806392822503549e+02, 2.805928344520653e+02, 2.805517273321748e+02, 2.805156860351562e+02, 2.804843139374861e+02, 2.804573668965022e+02, 2.804345093177981e+02, 2.804154968429066e+02, 2.804000244140625e+02, 2.803879089257971e+02, 2.803788452008739e+02, 2.803726501563797e+02, 2.803690795923176e+02, 2.803679504394531e+02, 2.803742981090909e+02, 2.803934326684103e+02, 2.804252928983187e+02, 2.804697570329299e+02, 2.805266723632812e+02, 2.805958863035194e+02, 2.806772157449743e+02, 2.807704160729189e+02, 2.808751830011314e+02, 2.809912414550781e+02, 2.811182252248401e+02, 2.812557986140021e+02, 2.814035641635416e+02, 2.815610655200142e+02, 2.817279052734375e+02, 2.81903595142998e+02, 2.820876468443897e+02, 2.822795406439687e+02, 2.824787900905356e+02, 2.826848754882812e+02, 2.828972475202174e+02, 2.831153263497403e+02, 2.833385920997239e+02, 2.835664670661497e+02, 2.837984313964844e+02, 2.840338747380013e+02, 2.842722782895439e+02, 2.845130915800105e+02, 2.847557675901623e+02, 2.849997863769531e+02, 2.852445974538782e+02, 2.854897465611468e+02, 2.857346797089665e+02, 2.85978974318809e+02, 2.8622216796875e+02, 2.864637747162698e+02, 2.867034306303727e+02, 2.869407038951861e+02, 2.871752023036622e+02, 2.874066162109375e+02, 2.876345816551673e+02, 2.878587650715975e+02, 2.880789485578521e+02, 2.882948006178299e+02, 2.88506103515625e+02, 2.887126762214062e+02, 2.889142765016791e+02, 2.891107784378194e+02, 2.89302002670227e+02, 2.894878234863281e+02]
+sin.T=[2.931499938964844e+02, 2.931499938964844e+02]
+sou2.T=[2.831499938964844e+02, 2.831499938964844e+02]
+fouPor.vol2.T=[2.931499938964844e+02, 2.926622924875901e+02, 2.921983642713594e+02, 2.917570496121152e+02, 2.913372802979666e+02, 2.9093798828125e+02, 2.905581665926728e+02, 2.901968688546841e+02, 2.898531799718039e+02, 2.895262755591322e+02, 2.892153015136719e+02, 2.889194946980279e+02, 2.886380921725643e+02, 2.883704527570232e+02, 2.881158446676636e+02, 2.878736572265625e+02, 2.87643280083139e+02, 2.874241334032262e+02, 2.872156981457088e+02, 2.870173949736563e+02, 2.868287963867188e+02, 2.866493833788844e+02, 2.864786988102133e+02, 2.863163451397558e+02, 2.861619264138864e+02, 2.860150451660156e+02, 2.858753050465601e+02, 2.857424011851836e+02, 2.856159667383762e+02, 2.854956971339708e+02, 2.853812866210938e+02, 2.852724608368006e+02, 2.851689758783905e+02, 2.850704955599212e+02, 2.849768372456602e+02, 2.848877258300781e+02, 2.848029784371901e+02, 2.847223816294136e+02, 2.84645690882462e+02, 2.845727234569204e+02, 2.845033569335938e+02, 2.844373473509913e+02, 2.843745726374908e+02, 2.843148499649834e+02, 2.842580261761614e+02, 2.842039794921875e+02, 2.841525878430402e+02, 2.841036986399557e+02, 2.840571900281357e+02, 2.840129394944525e+02, 2.839708557128906e+02, 2.839308166132832e+02, 2.838927306424593e+02, 2.838565064154682e+02, 2.838220520341129e+02, 2.837892761230469e+02, 2.837581176468229e+02, 2.837284545348375e+02, 2.837002258830472e+02, 2.836734009039355e+02, 2.836478881835938e+02, 2.836235961689963e+02, 2.836004943419829e+02, 2.835785217695521e+02, 2.835576172071451e+02, 2.835377502441406e+02, 2.835188293282408e+02, 2.83500854458718e+02, 2.834837341628736e+02, 2.834674682768527e+02, 2.834519653320312e+02, 2.834372558456962e+02, 2.834232482651132e+02, 2.834099121344043e+02, 2.833972473262402e+02, 2.833851928710938e+02, 2.833737182510959e+02, 2.833627929486684e+02, 2.833524170116871e+02, 2.833425598236208e+02, 2.833331604003906e+02, 2.833242187837596e+02, 2.833157348475655e+02, 2.833076477202118e+02, 2.832999572468695e+02, 2.832926330566406e+02, 2.832856750750209e+02, 2.832790832394388e+02, 2.832727661252135e+02, 2.832667846458504e+02, 2.832610778808594e+02, 2.832556762899035e+02, 2.832505187892241e+02, 2.83245605478063e+02, 2.832409667794131e+02, 2.832365112304688e+02, 2.832322998204032e+02, 2.832282714770992e+02, 2.832244567943852e+02, 2.83220825181925e+02, 2.832173767089844e+02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_HeaterCooler_u.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_HeaterCooler_u.txt
new file mode 100644
index 00000000..ea46a157
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_HeaterCooler_u.txt
@@ -0,0 +1,49 @@
+last-generated=2017-03-31
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "10",
+ "linear": " "
+}
+senTem1a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+senTem2a.T=[2.931499938964844e+02, 2.940004272460938e+02, 2.936427917480469e+02, 2.933502502441406e+02, 2.932064819335938e+02, 2.931463928222656e+02, 2.931232604980469e+02, 2.931147766113281e+02, 2.931117553710938e+02, 2.931107177734375e+02, 2.931103515625e+02, 2.931102294921875e+02, 2.931101989746094e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02]
+senTem2b.T=[2.931499938964844e+02, 2.914997863769531e+02, 2.910361633300781e+02, 2.909299011230469e+02, 2.909313049316406e+02, 2.909651489257812e+02, 2.910087280273438e+02, 2.910552673339844e+02, 2.911026916503906e+02, 2.911503601074219e+02, 2.911981506347656e+02, 2.912459411621094e+02, 2.912937316894531e+02, 2.913415222167969e+02, 2.913893127441406e+02, 2.914371337890625e+02, 2.914849243164062e+02, 2.9153271484375e+02, 2.915805358886719e+02, 2.916283264160156e+02, 2.916761169433594e+02, 2.917239379882812e+02, 2.91771728515625e+02, 2.918195495605469e+02, 2.918673400878906e+02, 2.919151306152344e+02, 2.919629516601562e+02, 2.920107421875e+02, 2.920585327148438e+02, 2.921063537597656e+02, 2.921541442871094e+02, 2.922019348144531e+02, 2.92249755859375e+02, 2.922975463867188e+02, 2.923453369140625e+02, 2.923931579589844e+02, 2.924409484863281e+02, 2.924887390136719e+02, 2.925365600585938e+02, 2.925843505859375e+02, 2.926321411132812e+02, 2.926799621582031e+02, 2.927277526855469e+02, 2.927755432128906e+02, 2.928233642578125e+02, 2.928711547851562e+02, 2.929189758300781e+02, 2.929667663574219e+02, 2.930145568847656e+02, 2.930623779296875e+02, 2.931101684570312e+02, 2.93157958984375e+02, 2.932057800292969e+02, 2.932535705566406e+02, 2.933013610839844e+02, 2.933491821289062e+02, 2.9339697265625e+02, 2.934447631835938e+02, 2.934925842285156e+02, 2.935403747558594e+02, 2.935881652832031e+02, 2.93635986328125e+02, 2.936837768554688e+02, 2.937315673828125e+02, 2.937793884277344e+02, 2.938271789550781e+02, 2.938749694824219e+02, 2.939227905273438e+02, 2.939705810546875e+02, 2.940184020996094e+02, 2.940661926269531e+02, 2.941139831542969e+02, 2.941618041992188e+02, 2.942095947265625e+02, 2.942573852539062e+02, 2.943052062988281e+02, 2.943529968261719e+02, 2.944007873535156e+02, 2.944486083984375e+02, 2.944963989257812e+02, 2.94544189453125e+02, 2.945920104980469e+02, 2.946398010253906e+02, 2.946875915527344e+02, 2.947354125976562e+02, 2.94783203125e+02, 2.948309936523438e+02, 2.948788146972656e+02, 2.949266052246094e+02, 2.949743957519531e+02, 2.95022216796875e+02, 2.950700073242188e+02, 2.951178283691406e+02, 2.951656188964844e+02, 2.952134094238281e+02, 2.9526123046875e+02, 2.953090209960938e+02, 2.953568115234375e+02, 2.954046325683594e+02, 2.954524230957031e+02, 2.955002136230469e+02]
+senTem1b.T=[2.931499938964844e+02, 2.914997863769531e+02, 2.910361633300781e+02, 2.909299011230469e+02, 2.909313049316406e+02, 2.909651489257812e+02, 2.910087280273438e+02, 2.910552673339844e+02, 2.911026916503906e+02, 2.911503601074219e+02, 2.911981506347656e+02, 2.912459411621094e+02, 2.912937316894531e+02, 2.913415222167969e+02, 2.913893127441406e+02, 2.914371337890625e+02, 2.914849243164062e+02, 2.9153271484375e+02, 2.915805358886719e+02, 2.916283264160156e+02, 2.916761169433594e+02, 2.917239379882812e+02, 2.91771728515625e+02, 2.918195495605469e+02, 2.918673400878906e+02, 2.919151306152344e+02, 2.919629516601562e+02, 2.920107421875e+02, 2.920585327148438e+02, 2.921063537597656e+02, 2.921541442871094e+02, 2.922019348144531e+02, 2.92249755859375e+02, 2.922975463867188e+02, 2.923453369140625e+02, 2.923931579589844e+02, 2.924409484863281e+02, 2.924887390136719e+02, 2.925365600585938e+02, 2.925843505859375e+02, 2.926321411132812e+02, 2.926799621582031e+02, 2.927277526855469e+02, 2.927755432128906e+02, 2.928233642578125e+02, 2.928711547851562e+02, 2.929189758300781e+02, 2.929667663574219e+02, 2.930145568847656e+02, 2.930623779296875e+02, 2.931101684570312e+02, 2.93157958984375e+02, 2.932057800292969e+02, 2.932535705566406e+02, 2.933013610839844e+02, 2.933491821289062e+02, 2.9339697265625e+02, 2.934447631835938e+02, 2.934925842285156e+02, 2.935403747558594e+02, 2.935881652832031e+02, 2.93635986328125e+02, 2.936837768554688e+02, 2.937315673828125e+02, 2.937793884277344e+02, 2.938271789550781e+02, 2.938749694824219e+02, 2.939227905273438e+02, 2.939705810546875e+02, 2.940184020996094e+02, 2.940661926269531e+02, 2.941139831542969e+02, 2.941618041992188e+02, 2.942095947265625e+02, 2.942573852539062e+02, 2.943052062988281e+02, 2.943529968261719e+02, 2.944007873535156e+02, 2.944486083984375e+02, 2.944963989257812e+02, 2.94544189453125e+02, 2.945920104980469e+02, 2.946398010253906e+02, 2.946875915527344e+02, 2.947354125976562e+02, 2.94783203125e+02, 2.948309936523438e+02, 2.948788146972656e+02, 2.949266052246094e+02, 2.949743957519531e+02, 2.95022216796875e+02, 2.950700073242188e+02, 2.951178283691406e+02, 2.951656188964844e+02, 2.952134094238281e+02, 2.9526123046875e+02, 2.953090209960938e+02, 2.953568115234375e+02, 2.954046325683594e+02, 2.954524230957031e+02, 2.955002136230469e+02]
+time=[0e+00, 3.6e+03]
+mix1.T=[2.931499938964844e+02, 2.914949951171875e+02, 2.910263366699219e+02, 2.909176330566406e+02, 2.909181823730469e+02, 2.909518432617188e+02, 2.909955444335938e+02, 2.910423278808594e+02, 2.910899963378906e+02, 2.911379699707031e+02, 2.9118603515625e+02, 2.912341003417969e+02, 2.912821960449219e+02, 2.913302917480469e+02, 2.913783874511719e+02, 2.914264526367188e+02, 2.914745483398438e+02, 2.915226440429688e+02, 2.915707397460938e+02, 2.916188354492188e+02, 2.916669311523438e+02, 2.917150268554688e+02, 2.917631225585938e+02, 2.918111877441406e+02, 2.918592834472656e+02, 2.919073791503906e+02, 2.919554748535156e+02, 2.920035705566406e+02, 2.920516662597656e+02, 2.920997619628906e+02, 2.921478576660156e+02, 2.921959228515625e+02, 2.922440185546875e+02, 2.922921142578125e+02, 2.923402099609375e+02, 2.923883056640625e+02, 2.924364013671875e+02, 2.924844970703125e+02, 2.925325622558594e+02, 2.925806579589844e+02, 2.926287536621094e+02, 2.926768493652344e+02, 2.927249450683594e+02, 2.927730407714844e+02, 2.928211364746094e+02, 2.928692321777344e+02, 2.929172973632812e+02, 2.929653930664062e+02, 2.930134887695312e+02, 2.930615844726562e+02, 2.931096801757812e+02, 2.931577758789062e+02, 2.932058715820312e+02, 2.932539672851562e+02, 2.933020324707031e+02, 2.933501281738281e+02, 2.933982238769531e+02, 2.934463195800781e+02, 2.934944152832031e+02, 2.935425109863281e+02, 2.935906066894531e+02, 2.93638671875e+02, 2.93686767578125e+02, 2.9373486328125e+02, 2.93782958984375e+02, 2.938310546875e+02, 2.93879150390625e+02, 2.9392724609375e+02, 2.93975341796875e+02, 2.940234069824219e+02, 2.940715026855469e+02, 2.941195983886719e+02, 2.941676940917969e+02, 2.942157897949219e+02, 2.942638854980469e+02, 2.943119812011719e+02, 2.943600769042969e+02, 2.944081420898438e+02, 2.944562377929688e+02, 2.945043334960938e+02, 2.945524291992188e+02, 2.946005249023438e+02, 2.946486206054688e+02, 2.946967163085938e+02, 2.947447814941406e+02, 2.947928771972656e+02, 2.948409729003906e+02, 2.948890686035156e+02, 2.949371643066406e+02, 2.949852600097656e+02, 2.950333557128906e+02, 2.950814514160156e+02, 2.951295166015625e+02, 2.951776123046875e+02, 2.952257080078125e+02, 2.952738037109375e+02, 2.953218994140625e+02, 2.953699951171875e+02, 2.954180908203125e+02, 2.954661865234375e+02, 2.955142517089844e+02]
+senTem4a.T=[2.931499938964844e+02, 2.940066833496094e+02, 2.936502380371094e+02, 2.933551025390625e+02, 2.932088317871094e+02, 2.931472473144531e+02, 2.931233520507812e+02, 2.931145324707031e+02, 2.931113586425781e+02, 2.931102600097656e+02, 2.9310986328125e+02, 2.931097412109375e+02, 2.931097106933594e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02]
+senTem3b.T=[2.931499938964844e+02, 2.914949340820312e+02, 2.910263061523438e+02, 2.909176330566406e+02, 2.909181823730469e+02, 2.909518432617188e+02, 2.909955444335938e+02, 2.910423278808594e+02, 2.910899963378906e+02, 2.911379699707031e+02, 2.9118603515625e+02, 2.912341003417969e+02, 2.912821960449219e+02, 2.913302917480469e+02, 2.913783874511719e+02, 2.914264831542969e+02, 2.914745483398438e+02, 2.915226440429688e+02, 2.915707397460938e+02, 2.916188354492188e+02, 2.916669311523438e+02, 2.917150268554688e+02, 2.917631225585938e+02, 2.918112182617188e+02, 2.918592834472656e+02, 2.919073791503906e+02, 2.919554748535156e+02, 2.920035705566406e+02, 2.920516662597656e+02, 2.920997619628906e+02, 2.921478576660156e+02, 2.921959228515625e+02, 2.922440185546875e+02, 2.922921142578125e+02, 2.923402099609375e+02, 2.923883056640625e+02, 2.924364013671875e+02, 2.924844970703125e+02, 2.925325927734375e+02, 2.925806579589844e+02, 2.926287536621094e+02, 2.926768493652344e+02, 2.927249450683594e+02, 2.927730407714844e+02, 2.928211364746094e+02, 2.928692321777344e+02, 2.929173278808594e+02, 2.929653930664062e+02, 2.930134887695312e+02, 2.930615844726562e+02, 2.931096801757812e+02, 2.931577758789062e+02, 2.932058715820312e+02, 2.932539672851562e+02, 2.933020324707031e+02, 2.933501281738281e+02, 2.933982238769531e+02, 2.934463195800781e+02, 2.934944152832031e+02, 2.935425109863281e+02, 2.935906066894531e+02, 2.936387023925781e+02, 2.93686767578125e+02, 2.9373486328125e+02, 2.93782958984375e+02, 2.938310546875e+02, 2.93879150390625e+02, 2.9392724609375e+02, 2.93975341796875e+02, 2.940234375e+02, 2.940715026855469e+02, 2.941195983886719e+02, 2.941676940917969e+02, 2.942157897949219e+02, 2.942638854980469e+02, 2.943119812011719e+02, 2.943600769042969e+02, 2.944081420898438e+02, 2.944562377929688e+02, 2.945043334960938e+02, 2.945524291992188e+02, 2.946005249023438e+02, 2.946486206054688e+02, 2.946967163085938e+02, 2.947448120117188e+02, 2.947928771972656e+02, 2.948409729003906e+02, 2.948890686035156e+02, 2.949371643066406e+02, 2.949852600097656e+02, 2.950333557128906e+02, 2.950814514160156e+02, 2.951295471191406e+02, 2.951776123046875e+02, 2.952257080078125e+02, 2.952738037109375e+02, 2.953218994140625e+02, 2.953699951171875e+02, 2.954180908203125e+02, 2.954661865234375e+02, 2.955142517089844e+02]
+senTem4b.T=[2.931499938964844e+02, 2.914949951171875e+02, 2.910263366699219e+02, 2.909176330566406e+02, 2.909181823730469e+02, 2.909518432617188e+02, 2.909955444335938e+02, 2.910423278808594e+02, 2.910899963378906e+02, 2.911379699707031e+02, 2.9118603515625e+02, 2.912341003417969e+02, 2.912821960449219e+02, 2.913302917480469e+02, 2.913783874511719e+02, 2.914264526367188e+02, 2.914745483398438e+02, 2.915226440429688e+02, 2.915707397460938e+02, 2.916188354492188e+02, 2.916669311523438e+02, 2.917150268554688e+02, 2.917631225585938e+02, 2.918111877441406e+02, 2.918592834472656e+02, 2.919073791503906e+02, 2.919554748535156e+02, 2.920035705566406e+02, 2.920516662597656e+02, 2.920997619628906e+02, 2.921478576660156e+02, 2.921959228515625e+02, 2.922440185546875e+02, 2.922921142578125e+02, 2.923402099609375e+02, 2.923883056640625e+02, 2.924364013671875e+02, 2.924844970703125e+02, 2.925325622558594e+02, 2.925806579589844e+02, 2.926287536621094e+02, 2.926768493652344e+02, 2.927249450683594e+02, 2.927730407714844e+02, 2.928211364746094e+02, 2.928692321777344e+02, 2.929172973632812e+02, 2.929653930664062e+02, 2.930134887695312e+02, 2.930615844726562e+02, 2.931096801757812e+02, 2.931577758789062e+02, 2.932058715820312e+02, 2.932539672851562e+02, 2.933020324707031e+02, 2.933501281738281e+02, 2.933982238769531e+02, 2.934463195800781e+02, 2.934944152832031e+02, 2.935425109863281e+02, 2.935906066894531e+02, 2.93638671875e+02, 2.93686767578125e+02, 2.9373486328125e+02, 2.93782958984375e+02, 2.938310546875e+02, 2.93879150390625e+02, 2.9392724609375e+02, 2.93975341796875e+02, 2.940234069824219e+02, 2.940715026855469e+02, 2.941195983886719e+02, 2.941676940917969e+02, 2.942157897949219e+02, 2.942638854980469e+02, 2.943119812011719e+02, 2.943600769042969e+02, 2.944081420898438e+02, 2.944562377929688e+02, 2.945043334960938e+02, 2.945524291992188e+02, 2.946005249023438e+02, 2.946486206054688e+02, 2.946967163085938e+02, 2.947447814941406e+02, 2.947928771972656e+02, 2.948409729003906e+02, 2.948890686035156e+02, 2.949371643066406e+02, 2.949852600097656e+02, 2.950333557128906e+02, 2.950814514160156e+02, 2.951295166015625e+02, 2.951776123046875e+02, 2.952257080078125e+02, 2.952738037109375e+02, 2.953218994140625e+02, 2.953699951171875e+02, 2.954180908203125e+02, 2.954661865234375e+02, 2.955142517089844e+02]
+senTem3a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+hea1.m_flow=[5e-01, 5e-01]
+hea2.m_flow=[-5e-01, -5e-01]
+hea4.m_flow=[-4.969788193702698e-01, -4.969788193702698e-01]
+hea3.m_flow=[4.969788193702698e-01, 4.969788193702698e-01]
+senTem6b.T=[2.931499938964844e+02, 2.914997863769531e+02, 2.910361633300781e+02, 2.909299011230469e+02, 2.909313049316406e+02, 2.909651489257812e+02, 2.910087280273438e+02, 2.910552673339844e+02, 2.911026916503906e+02, 2.911503601074219e+02, 2.911981506347656e+02, 2.912459411621094e+02, 2.912937316894531e+02, 2.913415222167969e+02, 2.913893127441406e+02, 2.914371337890625e+02, 2.914849243164062e+02, 2.9153271484375e+02, 2.915805358886719e+02, 2.916283264160156e+02, 2.916761169433594e+02, 2.917239379882812e+02, 2.91771728515625e+02, 2.918195495605469e+02, 2.918673400878906e+02, 2.919151306152344e+02, 2.919629516601562e+02, 2.920107421875e+02, 2.920585327148438e+02, 2.921063537597656e+02, 2.921541442871094e+02, 2.922019348144531e+02, 2.92249755859375e+02, 2.922975463867188e+02, 2.923453369140625e+02, 2.923931579589844e+02, 2.924409484863281e+02, 2.924887390136719e+02, 2.925365600585938e+02, 2.925843505859375e+02, 2.926321411132812e+02, 2.926799621582031e+02, 2.927277526855469e+02, 2.927755432128906e+02, 2.928233642578125e+02, 2.928711547851562e+02, 2.929189758300781e+02, 2.929667663574219e+02, 2.930145568847656e+02, 2.930623779296875e+02, 2.931101684570312e+02, 2.93157958984375e+02, 2.932057800292969e+02, 2.932535705566406e+02, 2.933013610839844e+02, 2.933491821289062e+02, 2.9339697265625e+02, 2.934447631835938e+02, 2.934925842285156e+02, 2.935403747558594e+02, 2.935881652832031e+02, 2.93635986328125e+02, 2.936837768554688e+02, 2.937315673828125e+02, 2.937793884277344e+02, 2.938271789550781e+02, 2.938749694824219e+02, 2.939227905273438e+02, 2.939705810546875e+02, 2.940184020996094e+02, 2.940661926269531e+02, 2.941139831542969e+02, 2.941618041992188e+02, 2.942095947265625e+02, 2.942573852539062e+02, 2.943052062988281e+02, 2.943529968261719e+02, 2.944007873535156e+02, 2.944486083984375e+02, 2.944963989257812e+02, 2.94544189453125e+02, 2.945920104980469e+02, 2.946398010253906e+02, 2.946875915527344e+02, 2.947354125976562e+02, 2.94783203125e+02, 2.948309936523438e+02, 2.948788146972656e+02, 2.949266052246094e+02, 2.949743957519531e+02, 2.95022216796875e+02, 2.950700073242188e+02, 2.951178283691406e+02, 2.951656188964844e+02, 2.952134094238281e+02, 2.9526123046875e+02, 2.953090209960938e+02, 2.953568115234375e+02, 2.954046325683594e+02, 2.954524230957031e+02, 2.955002136230469e+02]
+senTem5b.T=[2.931499938964844e+02, 2.914997863769531e+02, 2.910361633300781e+02, 2.909299011230469e+02, 2.909313049316406e+02, 2.909651489257812e+02, 2.910087280273438e+02, 2.910552673339844e+02, 2.911026916503906e+02, 2.911503601074219e+02, 2.911981506347656e+02, 2.912459411621094e+02, 2.912937316894531e+02, 2.913415222167969e+02, 2.913893127441406e+02, 2.914371337890625e+02, 2.914849243164062e+02, 2.9153271484375e+02, 2.915805358886719e+02, 2.916283264160156e+02, 2.916761169433594e+02, 2.917239379882812e+02, 2.91771728515625e+02, 2.918195495605469e+02, 2.918673400878906e+02, 2.919151306152344e+02, 2.919629516601562e+02, 2.920107421875e+02, 2.920585327148438e+02, 2.921063537597656e+02, 2.921541442871094e+02, 2.922019348144531e+02, 2.92249755859375e+02, 2.922975463867188e+02, 2.923453369140625e+02, 2.923931579589844e+02, 2.924409484863281e+02, 2.924887390136719e+02, 2.925365600585938e+02, 2.925843505859375e+02, 2.926321411132812e+02, 2.926799621582031e+02, 2.927277526855469e+02, 2.927755432128906e+02, 2.928233642578125e+02, 2.928711547851562e+02, 2.929189758300781e+02, 2.929667663574219e+02, 2.930145568847656e+02, 2.930623779296875e+02, 2.931101684570312e+02, 2.93157958984375e+02, 2.932057800292969e+02, 2.932535705566406e+02, 2.933013610839844e+02, 2.933491821289062e+02, 2.9339697265625e+02, 2.934447631835938e+02, 2.934925842285156e+02, 2.935403747558594e+02, 2.935881652832031e+02, 2.93635986328125e+02, 2.936837768554688e+02, 2.937315673828125e+02, 2.937793884277344e+02, 2.938271789550781e+02, 2.938749694824219e+02, 2.939227905273438e+02, 2.939705810546875e+02, 2.940184020996094e+02, 2.940661926269531e+02, 2.941139831542969e+02, 2.941618041992188e+02, 2.942095947265625e+02, 2.942573852539062e+02, 2.943052062988281e+02, 2.943529968261719e+02, 2.944007873535156e+02, 2.944486083984375e+02, 2.944963989257812e+02, 2.94544189453125e+02, 2.945920104980469e+02, 2.946398010253906e+02, 2.946875915527344e+02, 2.947354125976562e+02, 2.94783203125e+02, 2.948309936523438e+02, 2.948788146972656e+02, 2.949266052246094e+02, 2.949743957519531e+02, 2.95022216796875e+02, 2.950700073242188e+02, 2.951178283691406e+02, 2.951656188964844e+02, 2.952134094238281e+02, 2.9526123046875e+02, 2.953090209960938e+02, 2.953568115234375e+02, 2.954046325683594e+02, 2.954524230957031e+02, 2.955002136230469e+02]
+senTem5a.T=[2.931499938964844e+02, 2.940004272460938e+02, 2.936427917480469e+02, 2.933502502441406e+02, 2.932064819335938e+02, 2.931463928222656e+02, 2.931232604980469e+02, 2.931147766113281e+02, 2.931117553710938e+02, 2.931107177734375e+02, 2.931103515625e+02, 2.931102294921875e+02, 2.931101989746094e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02, 2.931101684570312e+02]
+senTem7b.T=[2.931499938964844e+02, 2.914949951171875e+02, 2.910263366699219e+02, 2.909176330566406e+02, 2.909181823730469e+02, 2.909518432617188e+02, 2.909955444335938e+02, 2.910423278808594e+02, 2.910899963378906e+02, 2.911379699707031e+02, 2.9118603515625e+02, 2.912341003417969e+02, 2.912821960449219e+02, 2.913302917480469e+02, 2.913783874511719e+02, 2.914264526367188e+02, 2.914745483398438e+02, 2.915226440429688e+02, 2.915707397460938e+02, 2.916188354492188e+02, 2.916669311523438e+02, 2.917150268554688e+02, 2.917631225585938e+02, 2.918111877441406e+02, 2.918592834472656e+02, 2.919073791503906e+02, 2.919554748535156e+02, 2.920035705566406e+02, 2.920516662597656e+02, 2.920997619628906e+02, 2.921478576660156e+02, 2.921959228515625e+02, 2.922440185546875e+02, 2.922921142578125e+02, 2.923402099609375e+02, 2.923883056640625e+02, 2.924364013671875e+02, 2.924844970703125e+02, 2.925325622558594e+02, 2.925806579589844e+02, 2.926287536621094e+02, 2.926768493652344e+02, 2.927249450683594e+02, 2.927730407714844e+02, 2.928211364746094e+02, 2.928692321777344e+02, 2.929172973632812e+02, 2.929653930664062e+02, 2.930134887695312e+02, 2.930615844726562e+02, 2.931096801757812e+02, 2.931577758789062e+02, 2.932058715820312e+02, 2.932539672851562e+02, 2.933020324707031e+02, 2.933501281738281e+02, 2.933982238769531e+02, 2.934463195800781e+02, 2.934944152832031e+02, 2.935425109863281e+02, 2.935906066894531e+02, 2.93638671875e+02, 2.93686767578125e+02, 2.9373486328125e+02, 2.93782958984375e+02, 2.938310546875e+02, 2.93879150390625e+02, 2.9392724609375e+02, 2.93975341796875e+02, 2.940234069824219e+02, 2.940715026855469e+02, 2.941195983886719e+02, 2.941676940917969e+02, 2.942157897949219e+02, 2.942638854980469e+02, 2.943119812011719e+02, 2.943600769042969e+02, 2.944081420898438e+02, 2.944562377929688e+02, 2.945043334960938e+02, 2.945524291992188e+02, 2.946005249023438e+02, 2.946486206054688e+02, 2.946967163085938e+02, 2.947447814941406e+02, 2.947928771972656e+02, 2.948409729003906e+02, 2.948890686035156e+02, 2.949371643066406e+02, 2.949852600097656e+02, 2.950333557128906e+02, 2.950814514160156e+02, 2.951295166015625e+02, 2.951776123046875e+02, 2.952257080078125e+02, 2.952738037109375e+02, 2.953218994140625e+02, 2.953699951171875e+02, 2.954180908203125e+02, 2.954661865234375e+02, 2.955142517089844e+02]
+senTem7a.T=[2.931499938964844e+02, 2.940066833496094e+02, 2.936502380371094e+02, 2.933551025390625e+02, 2.932088317871094e+02, 2.931472473144531e+02, 2.931233520507812e+02, 2.931145324707031e+02, 2.931113586425781e+02, 2.931102600097656e+02, 2.9310986328125e+02, 2.931097412109375e+02, 2.931097106933594e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02, 2.931096801757812e+02]
+senTem8a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+mix2.T=[2.931499938964844e+02, 2.914949951171875e+02, 2.910263366699219e+02, 2.909176330566406e+02, 2.909181823730469e+02, 2.909518432617188e+02, 2.909955444335938e+02, 2.910423278808594e+02, 2.910899963378906e+02, 2.911379699707031e+02, 2.9118603515625e+02, 2.912341003417969e+02, 2.912821960449219e+02, 2.913302917480469e+02, 2.913783874511719e+02, 2.914264526367188e+02, 2.914745483398438e+02, 2.915226440429688e+02, 2.915707397460938e+02, 2.916188354492188e+02, 2.916669311523438e+02, 2.917150268554688e+02, 2.917631225585938e+02, 2.918111877441406e+02, 2.918592834472656e+02, 2.919073791503906e+02, 2.919554748535156e+02, 2.920035705566406e+02, 2.920516662597656e+02, 2.920997619628906e+02, 2.921478576660156e+02, 2.921959228515625e+02, 2.922440185546875e+02, 2.922921142578125e+02, 2.923402099609375e+02, 2.923883056640625e+02, 2.924364013671875e+02, 2.924844970703125e+02, 2.925325622558594e+02, 2.925806579589844e+02, 2.926287536621094e+02, 2.926768493652344e+02, 2.927249450683594e+02, 2.927730407714844e+02, 2.928211364746094e+02, 2.928692321777344e+02, 2.929172973632812e+02, 2.929653930664062e+02, 2.930134887695312e+02, 2.930615844726562e+02, 2.931096801757812e+02, 2.931577758789062e+02, 2.932058715820312e+02, 2.932539672851562e+02, 2.933020324707031e+02, 2.933501281738281e+02, 2.933982238769531e+02, 2.934463195800781e+02, 2.934944152832031e+02, 2.935425109863281e+02, 2.935906066894531e+02, 2.93638671875e+02, 2.93686767578125e+02, 2.9373486328125e+02, 2.93782958984375e+02, 2.938310546875e+02, 2.93879150390625e+02, 2.9392724609375e+02, 2.93975341796875e+02, 2.940234069824219e+02, 2.940715026855469e+02, 2.941195983886719e+02, 2.941676940917969e+02, 2.942157897949219e+02, 2.942638854980469e+02, 2.943119812011719e+02, 2.943600769042969e+02, 2.944081420898438e+02, 2.944562377929688e+02, 2.945043334960938e+02, 2.945524291992188e+02, 2.946005249023438e+02, 2.946486206054688e+02, 2.946967163085938e+02, 2.947447814941406e+02, 2.947928771972656e+02, 2.948409729003906e+02, 2.948890686035156e+02, 2.949371643066406e+02, 2.949852600097656e+02, 2.950333557128906e+02, 2.950814514160156e+02, 2.951295166015625e+02, 2.951776123046875e+02, 2.952257080078125e+02, 2.952738037109375e+02, 2.953218994140625e+02, 2.953699951171875e+02, 2.954180908203125e+02, 2.954661865234375e+02, 2.955142517089844e+02]
+senTem8b.T=[2.931499938964844e+02, 2.914949340820312e+02, 2.910263061523438e+02, 2.909176330566406e+02, 2.909181823730469e+02, 2.909518432617188e+02, 2.909955444335938e+02, 2.910423278808594e+02, 2.910899963378906e+02, 2.911379699707031e+02, 2.9118603515625e+02, 2.912341003417969e+02, 2.912821960449219e+02, 2.913302917480469e+02, 2.913783874511719e+02, 2.914264831542969e+02, 2.914745483398438e+02, 2.915226440429688e+02, 2.915707397460938e+02, 2.916188354492188e+02, 2.916669311523438e+02, 2.917150268554688e+02, 2.917631225585938e+02, 2.918112182617188e+02, 2.918592834472656e+02, 2.919073791503906e+02, 2.919554748535156e+02, 2.920035705566406e+02, 2.920516662597656e+02, 2.920997619628906e+02, 2.921478576660156e+02, 2.921959228515625e+02, 2.922440185546875e+02, 2.922921142578125e+02, 2.923402099609375e+02, 2.923883056640625e+02, 2.924364013671875e+02, 2.924844970703125e+02, 2.925325927734375e+02, 2.925806579589844e+02, 2.926287536621094e+02, 2.926768493652344e+02, 2.927249450683594e+02, 2.927730407714844e+02, 2.928211364746094e+02, 2.928692321777344e+02, 2.929173278808594e+02, 2.929653930664062e+02, 2.930134887695312e+02, 2.930615844726562e+02, 2.931096801757812e+02, 2.931577758789062e+02, 2.932058715820312e+02, 2.932539672851562e+02, 2.933020324707031e+02, 2.933501281738281e+02, 2.933982238769531e+02, 2.934463195800781e+02, 2.934944152832031e+02, 2.935425109863281e+02, 2.935906066894531e+02, 2.936387023925781e+02, 2.93686767578125e+02, 2.9373486328125e+02, 2.93782958984375e+02, 2.938310546875e+02, 2.93879150390625e+02, 2.9392724609375e+02, 2.93975341796875e+02, 2.940234375e+02, 2.940715026855469e+02, 2.941195983886719e+02, 2.941676940917969e+02, 2.942157897949219e+02, 2.942638854980469e+02, 2.943119812011719e+02, 2.943600769042969e+02, 2.944081420898438e+02, 2.944562377929688e+02, 2.945043334960938e+02, 2.945524291992188e+02, 2.946005249023438e+02, 2.946486206054688e+02, 2.946967163085938e+02, 2.947448120117188e+02, 2.947928771972656e+02, 2.948409729003906e+02, 2.948890686035156e+02, 2.949371643066406e+02, 2.949852600097656e+02, 2.950333557128906e+02, 2.950814514160156e+02, 2.951295471191406e+02, 2.951776123046875e+02, 2.952257080078125e+02, 2.952738037109375e+02, 2.953218994140625e+02, 2.953699951171875e+02, 2.954180908203125e+02, 2.954661865234375e+02, 2.955142517089844e+02]
+hea5.m_flow=[-5e-01, -5e-01]
+hea6.m_flow=[5e-01, 5e-01]
+hea7.m_flow=[-4.969788193702698e-01, -4.969788193702698e-01]
+hea8.m_flow=[4.969788193702698e-01, 4.969788193702698e-01]
+che1.y=[0e+00, -8.504133224487305e-01, -4.92800235748291e-01, -2.002598792314529e-01, -5.647782236337662e-02, 3.602869110181928e-03, 2.674034796655178e-02, 3.523118793964386e-02, 3.824866190552711e-02, 3.92940454185009e-02, 3.96469421684742e-02, 3.976890817284584e-02, 3.981175273656845e-02, 3.98261658847332e-02, 3.983239084482193e-02, 3.983572497963905e-02, 3.98363396525383e-02, 3.983533754944801e-02, 3.983429074287415e-02, 3.983425721526146e-02, 3.983404487371445e-02, 3.983408957719803e-02, 3.983412683010101e-02, 3.9834164083004e-02, 3.983420133590698e-02, 3.983423486351967e-02, 3.983425348997116e-02, 3.983425721526146e-02, 3.983426094055176e-02, 3.983426466584206e-02, 3.983426839113235e-02, 3.983427211642265e-02, 3.983427584171295e-02, 3.983427956700325e-02, 3.983428329229355e-02, 3.983428701758385e-02, 3.983428701758385e-02, 3.983428701758385e-02, 3.983428701758385e-02, 3.983428701758385e-02, 3.983428701758385e-02, 3.983428701758385e-02, 3.983428701758385e-02, 3.983428701758385e-02, 3.983428701758385e-02, 3.983428701758385e-02, 3.983428701758385e-02, 3.983428701758385e-02, 3.983428701758385e-02, 3.983428701758385e-02, 3.983428701758385e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02, 3.983429074287415e-02]
+che4.y=[0e+00, -8.56698215007782e-01, -5.002268552780151e-01, -2.051057666540146e-01, -5.884422734379768e-02, 2.746270736679435e-03, 2.664423547685146e-02, 3.547934442758561e-02, 3.86422798037529e-02, 3.974618017673492e-02, 4.012171924114227e-02, 4.025224223732948e-02, 4.029832035303116e-02, 4.031392931938171e-02, 4.032063856720924e-02, 4.032421484589577e-02, 4.032488912343979e-02, 4.032384976744652e-02, 4.032274335622787e-02, 4.032270610332489e-02, 4.032248631119728e-02, 4.032253473997116e-02, 4.032257571816444e-02, 4.032261669635773e-02, 4.032265394926071e-02, 4.03226912021637e-02, 4.032270982861519e-02, 4.032271727919579e-02, 4.032272100448608e-02, 4.032272472977638e-02, 4.032272845506668e-02, 4.032273218035698e-02, 4.032273590564728e-02, 4.032273963093758e-02, 4.032274335622787e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02]
+che5.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+che8.y=[0e+00, 8.56698215007782e-01, 5.002268552780151e-01, 2.051057666540146e-01, 5.884422734379768e-02, -2.746270736679435e-03, -2.664423547685146e-02, -3.547934442758561e-02, -3.86422798037529e-02, -3.974618017673492e-02, -4.012171924114227e-02, -4.025224223732948e-02, -4.029832035303116e-02, -4.031392931938171e-02, -4.032063856720924e-02, -4.032421484589577e-02, -4.032488912343979e-02, -4.032384976744652e-02, -4.032274335622787e-02, -4.032270610332489e-02, -4.032248631119728e-02, -4.032253473997116e-02, -4.032257571816444e-02, -4.032261669635773e-02, -4.032265394926071e-02, -4.03226912021637e-02, -4.032270982861519e-02, -4.032271727919579e-02, -4.032272100448608e-02, -4.032272472977638e-02, -4.032272845506668e-02, -4.032273218035698e-02, -4.032273590564728e-02, -4.032273963093758e-02, -4.032274335622787e-02, -4.032274708151817e-02, -4.032274708151817e-02, -4.032274708151817e-02, -4.032274708151817e-02, -4.032274708151817e-02, -4.032274708151817e-02, -4.032274708151817e-02, -4.032274708151817e-02, -4.032274708151817e-02, -4.032274708151817e-02, -4.032274708151817e-02, -4.032274708151817e-02, -4.032274708151817e-02, -4.032274708151817e-02, -4.032274708151817e-02, -4.032274708151817e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02, -4.032275080680847e-02]
+che10.y=[0e+00, -8.56698215007782e-01, -5.002268552780151e-01, -2.051057666540146e-01, -5.884422734379768e-02, 2.746270736679435e-03, 2.664423547685146e-02, 3.547934442758561e-02, 3.86422798037529e-02, 3.974618017673492e-02, 4.012171924114227e-02, 4.025224223732948e-02, 4.029832035303116e-02, 4.031392931938171e-02, 4.032063856720924e-02, 4.032421484589577e-02, 4.032488912343979e-02, 4.032384976744652e-02, 4.032274335622787e-02, 4.032270610332489e-02, 4.032248631119728e-02, 4.032253473997116e-02, 4.032257571816444e-02, 4.032261669635773e-02, 4.032265394926071e-02, 4.03226912021637e-02, 4.032270982861519e-02, 4.032271727919579e-02, 4.032272100448608e-02, 4.032272472977638e-02, 4.032272845506668e-02, 4.032273218035698e-02, 4.032273590564728e-02, 4.032273963093758e-02, 4.032274335622787e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032274708151817e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02, 4.032275080680847e-02]
+che9.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+che2.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+che3.y=[0e+00, 4.655880911741406e-05, 1.226145468535833e-05, 1.855877940215578e-06, -1.301135398534825e-06, -2.258463837279123e-06, -2.549225428083446e-06, -2.637579200381879e-06, -2.664421572262654e-06, -2.67252221419767e-06, -2.674936240509851e-06, -2.675748874025885e-06, -2.676007397894864e-06, -2.676093117770506e-06, -2.676138592505595e-06, -2.676168151083402e-06, -2.676163376236218e-06, -2.676149051694665e-06, -2.67613631876884e-06, -2.676136091395165e-06, -2.676134499779437e-06, -2.676136546142516e-06, -2.676137228263542e-06, -2.676137910384568e-06, -2.676138592505595e-06, -2.676139274626621e-06, -2.676139502000296e-06, -2.676139502000296e-06, -2.676139729373972e-06, -2.676139729373972e-06, -2.676139729373972e-06, -2.676139729373972e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06, -2.676139956747647e-06]
+che6.y=[0e+00, 8.504133224487305e-01, 4.92800235748291e-01, 2.002598792314529e-01, 5.647782236337662e-02, -3.602869110181928e-03, -2.674034796655178e-02, -3.523118793964386e-02, -3.824866190552711e-02, -3.92940454185009e-02, -3.96469421684742e-02, -3.976890817284584e-02, -3.981175273656845e-02, -3.98261658847332e-02, -3.983239084482193e-02, -3.983572497963905e-02, -3.98363396525383e-02, -3.983533754944801e-02, -3.983429074287415e-02, -3.983425721526146e-02, -3.983404487371445e-02, -3.983408957719803e-02, -3.983412683010101e-02, -3.9834164083004e-02, -3.983420133590698e-02, -3.983423486351967e-02, -3.983425348997116e-02, -3.983425721526146e-02, -3.983426094055176e-02, -3.983426466584206e-02, -3.983426839113235e-02, -3.983427211642265e-02, -3.983427584171295e-02, -3.983427956700325e-02, -3.983428329229355e-02, -3.983428701758385e-02, -3.983428701758385e-02, -3.983428701758385e-02, -3.983428701758385e-02, -3.983428701758385e-02, -3.983428701758385e-02, -3.983428701758385e-02, -3.983428701758385e-02, -3.983428701758385e-02, -3.983428701758385e-02, -3.983428701758385e-02, -3.983428701758385e-02, -3.983428701758385e-02, -3.983428701758385e-02, -3.983428701758385e-02, -3.983428701758385e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02, -3.983429074287415e-02]
+che7.y=[0e+00, -4.655880911741406e-05, -1.226145468535833e-05, -1.855877940215578e-06, 1.301135398534825e-06, 2.258463837279123e-06, 2.549225428083446e-06, 2.637579200381879e-06, 2.664421572262654e-06, 2.67252221419767e-06, 2.674936240509851e-06, 2.675748874025885e-06, 2.676007397894864e-06, 2.676093117770506e-06, 2.676138592505595e-06, 2.676168151083402e-06, 2.676163376236218e-06, 2.676149051694665e-06, 2.67613631876884e-06, 2.676136091395165e-06, 2.676134499779437e-06, 2.676136546142516e-06, 2.676137228263542e-06, 2.676137910384568e-06, 2.676138592505595e-06, 2.676139274626621e-06, 2.676139502000296e-06, 2.676139502000296e-06, 2.676139729373972e-06, 2.676139729373972e-06, 2.676139729373972e-06, 2.676139729373972e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06, 2.676139956747647e-06]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_Humidifier_u.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_Humidifier_u.txt
new file mode 100644
index 00000000..17a2daef
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_Humidifier_u.txt
@@ -0,0 +1,59 @@
+last-generated=2017-04-14
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 1, 1, 1, 1, 1, 1, 1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 0, 1, 1, 1, 1, 0, 1, 1",
+ "number of continuous time states": "26",
+ "linear": "0, 0, 0, 0"
+}
+hea1.sta_b.T=[2.931499938964844e+02, 2.931428833007812e+02, 2.930924682617188e+02, 2.930425720214844e+02, 2.929928588867188e+02, 2.929432067871094e+02, 2.928935852050781e+02, 2.928439331054688e+02, 2.927943115234375e+02, 2.927446899414062e+02, 2.92695068359375e+02, 2.926454467773438e+02, 2.925958251953125e+02, 2.925462036132812e+02, 2.9249658203125e+02, 2.924469604492188e+02, 2.923973388671875e+02, 2.923477172851562e+02, 2.922981262207031e+02, 2.922485046386719e+02, 2.921988830566406e+02, 2.921492919921875e+02, 2.920996704101562e+02, 2.920500793457031e+02, 2.9200048828125e+02, 2.919508666992188e+02, 2.919012756347656e+02, 2.918516845703125e+02, 2.918020935058594e+02, 2.917525024414062e+02, 2.91702880859375e+02, 2.916533203125e+02, 2.916037292480469e+02, 2.915541381835938e+02, 2.915045471191406e+02, 2.914549560546875e+02, 2.914053649902344e+02, 2.913558044433594e+02, 2.913062133789062e+02, 2.912566528320312e+02, 2.912070617675781e+02, 2.911575012207031e+02, 2.9110791015625e+02, 2.91058349609375e+02, 2.910087890625e+02, 2.909591979980469e+02, 2.909096374511719e+02, 2.908600769042969e+02, 2.908105163574219e+02, 2.907609558105469e+02, 2.907113952636719e+02, 2.906618347167969e+02, 2.906122741699219e+02, 2.90562744140625e+02, 2.9051318359375e+02, 2.90463623046875e+02, 2.904140930175781e+02, 2.903645324707031e+02, 2.903150024414062e+02, 2.902654418945312e+02, 2.902159118652344e+02, 2.901663513183594e+02, 2.901168212890625e+02, 2.900672912597656e+02, 2.900177612304688e+02, 2.899682312011719e+02, 2.89918701171875e+02, 2.89869140625e+02, 2.898196411132812e+02, 2.897701110839844e+02, 2.897205810546875e+02, 2.896710510253906e+02, 2.896215209960938e+02, 2.89572021484375e+02, 2.895224914550781e+02, 2.894729614257812e+02, 2.894234619140625e+02, 2.893739318847656e+02, 2.893244323730469e+02, 2.892749328613281e+02, 2.892254028320312e+02, 2.891759033203125e+02, 2.891264038085938e+02, 2.89076904296875e+02, 2.890274047851562e+02, 2.889779052734375e+02, 2.889284057617188e+02, 2.8887890625e+02, 2.888294067382812e+02, 2.887799072265625e+02, 2.887304077148438e+02, 2.88680908203125e+02, 2.886314392089844e+02, 2.885819396972656e+02, 2.88532470703125e+02, 2.884829711914062e+02, 2.884335021972656e+02, 2.883840026855469e+02, 2.883345336914062e+02, 2.882850646972656e+02, 2.88235595703125e+02]
+hea2.sta_b.T=[2.931499938964844e+02, 2.931428833007812e+02, 2.930924682617188e+02, 2.930425720214844e+02, 2.929928588867188e+02, 2.929432067871094e+02, 2.928935852050781e+02, 2.928439331054688e+02, 2.927943115234375e+02, 2.927446899414062e+02, 2.92695068359375e+02, 2.926454467773438e+02, 2.925958251953125e+02, 2.925462036132812e+02, 2.9249658203125e+02, 2.924469604492188e+02, 2.923973388671875e+02, 2.923477172851562e+02, 2.922981262207031e+02, 2.922485046386719e+02, 2.921988830566406e+02, 2.921492919921875e+02, 2.920996704101562e+02, 2.920500793457031e+02, 2.9200048828125e+02, 2.919508666992188e+02, 2.919012756347656e+02, 2.918516845703125e+02, 2.918020935058594e+02, 2.917525024414062e+02, 2.91702880859375e+02, 2.916533203125e+02, 2.916037292480469e+02, 2.915541381835938e+02, 2.915045471191406e+02, 2.914549560546875e+02, 2.914053649902344e+02, 2.913558044433594e+02, 2.913062133789062e+02, 2.912566528320312e+02, 2.912070617675781e+02, 2.911575012207031e+02, 2.9110791015625e+02, 2.91058349609375e+02, 2.910087890625e+02, 2.909591979980469e+02, 2.909096374511719e+02, 2.908600769042969e+02, 2.908105163574219e+02, 2.907609558105469e+02, 2.907113952636719e+02, 2.906618347167969e+02, 2.906122741699219e+02, 2.90562744140625e+02, 2.9051318359375e+02, 2.90463623046875e+02, 2.904140930175781e+02, 2.903645324707031e+02, 2.903150024414062e+02, 2.902654418945312e+02, 2.902159118652344e+02, 2.901663513183594e+02, 2.901168212890625e+02, 2.900672912597656e+02, 2.900177612304688e+02, 2.899682312011719e+02, 2.89918701171875e+02, 2.89869140625e+02, 2.898196411132812e+02, 2.897701110839844e+02, 2.897205810546875e+02, 2.896710510253906e+02, 2.896215209960938e+02, 2.89572021484375e+02, 2.895224914550781e+02, 2.894729614257812e+02, 2.894234619140625e+02, 2.893739318847656e+02, 2.893244323730469e+02, 2.892749328613281e+02, 2.892254028320312e+02, 2.891759033203125e+02, 2.891264038085938e+02, 2.89076904296875e+02, 2.890274047851562e+02, 2.889779052734375e+02, 2.889284057617188e+02, 2.8887890625e+02, 2.888294067382812e+02, 2.887799072265625e+02, 2.887304077148438e+02, 2.88680908203125e+02, 2.886314392089844e+02, 2.885819396972656e+02, 2.88532470703125e+02, 2.884829711914062e+02, 2.884335021972656e+02, 2.883840026855469e+02, 2.883345336914062e+02, 2.882850646972656e+02, 2.88235595703125e+02]
+hea1.sta_a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+hea2.sta_a.T=[2.931499938964844e+02, 2.931939086914062e+02, 2.931925659179688e+02, 2.931918640136719e+02, 2.931915588378906e+02, 2.931914672851562e+02, 2.9319140625e+02, 2.9319140625e+02, 2.9319140625e+02, 2.9319140625e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02]
+time=[0e+00, 3.6e+03]
+hea3.sta_a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+mix1.T=[2.931499938964844e+02, 2.931437072753906e+02, 2.930921325683594e+02, 2.930411376953125e+02, 2.929902954101562e+02, 2.929395141601562e+02, 2.928887634277344e+02, 2.928380126953125e+02, 2.927872619628906e+02, 2.927365417480469e+02, 2.92685791015625e+02, 2.926350402832031e+02, 2.925843200683594e+02, 2.925335693359375e+02, 2.924828491210938e+02, 2.924320983886719e+02, 2.923813781738281e+02, 2.923306579589844e+02, 2.922799377441406e+02, 2.922291870117188e+02, 2.92178466796875e+02, 2.921277465820312e+02, 2.920770263671875e+02, 2.920263061523438e+02, 2.919755859375e+02, 2.919248962402344e+02, 2.918741760253906e+02, 2.918234558105469e+02, 2.917727661132812e+02, 2.917220458984375e+02, 2.916713256835938e+02, 2.916206359863281e+02, 2.915699462890625e+02, 2.915192260742188e+02, 2.914685363769531e+02, 2.914178466796875e+02, 2.913671569824219e+02, 2.913164367675781e+02, 2.912657470703125e+02, 2.912150573730469e+02, 2.911643676757812e+02, 2.911136779785156e+02, 2.910630187988281e+02, 2.910123291015625e+02, 2.909616394042969e+02, 2.909109497070312e+02, 2.908602905273438e+02, 2.908096008300781e+02, 2.907589416503906e+02, 2.90708251953125e+02, 2.906575927734375e+02, 2.9060693359375e+02, 2.905562438964844e+02, 2.905055847167969e+02, 2.904549255371094e+02, 2.904042663574219e+02, 2.903536071777344e+02, 2.903029479980469e+02, 2.902522888183594e+02, 2.902016296386719e+02, 2.901509704589844e+02, 2.90100341796875e+02, 2.900496826171875e+02, 2.899990234375e+02, 2.899483947753906e+02, 2.898977355957031e+02, 2.898471069335938e+02, 2.897964477539062e+02, 2.897458190917969e+02, 2.896951904296875e+02, 2.8964453125e+02, 2.895939025878906e+02, 2.895432739257812e+02, 2.894926452636719e+02, 2.894420166015625e+02, 2.893913879394531e+02, 2.893407592773438e+02, 2.892901306152344e+02, 2.89239501953125e+02, 2.891889038085938e+02, 2.891382751464844e+02, 2.89087646484375e+02, 2.890370483398438e+02, 2.889864196777344e+02, 2.889358215332031e+02, 2.888852233886719e+02, 2.888345947265625e+02, 2.887839965820312e+02, 2.887333984375e+02, 2.886828002929688e+02, 2.886321716308594e+02, 2.885815734863281e+02, 2.885309753417969e+02, 2.884803771972656e+02, 2.884298095703125e+02, 2.883792114257812e+02, 2.8832861328125e+02, 2.882780151367188e+02, 2.882274475097656e+02, 2.881768493652344e+02, 2.881262817382812e+02]
+hea3.sta_b.T=[2.931499938964844e+02, 2.931437072753906e+02, 2.930921325683594e+02, 2.930411376953125e+02, 2.929902954101562e+02, 2.929395141601562e+02, 2.928887634277344e+02, 2.928380126953125e+02, 2.927872619628906e+02, 2.927365417480469e+02, 2.92685791015625e+02, 2.926350402832031e+02, 2.925843200683594e+02, 2.925335693359375e+02, 2.924828491210938e+02, 2.924320983886719e+02, 2.923813781738281e+02, 2.923306579589844e+02, 2.922799377441406e+02, 2.922291870117188e+02, 2.92178466796875e+02, 2.921277465820312e+02, 2.920770263671875e+02, 2.920263061523438e+02, 2.919755859375e+02, 2.919248962402344e+02, 2.918741760253906e+02, 2.918234558105469e+02, 2.917727661132812e+02, 2.917220458984375e+02, 2.916713256835938e+02, 2.916206359863281e+02, 2.915699462890625e+02, 2.915192260742188e+02, 2.914685363769531e+02, 2.914178466796875e+02, 2.913671569824219e+02, 2.913164367675781e+02, 2.912657470703125e+02, 2.912150573730469e+02, 2.911643676757812e+02, 2.911136779785156e+02, 2.910630187988281e+02, 2.910123291015625e+02, 2.909616394042969e+02, 2.909109497070312e+02, 2.908602905273438e+02, 2.908096008300781e+02, 2.907589416503906e+02, 2.90708251953125e+02, 2.906575927734375e+02, 2.9060693359375e+02, 2.905562438964844e+02, 2.905055847167969e+02, 2.904549255371094e+02, 2.904042663574219e+02, 2.903536071777344e+02, 2.903029479980469e+02, 2.902522888183594e+02, 2.902016296386719e+02, 2.901509704589844e+02, 2.90100341796875e+02, 2.900496826171875e+02, 2.899990234375e+02, 2.899483947753906e+02, 2.898977355957031e+02, 2.898471069335938e+02, 2.897964477539062e+02, 2.897458190917969e+02, 2.896951904296875e+02, 2.8964453125e+02, 2.895939025878906e+02, 2.895432739257812e+02, 2.894926452636719e+02, 2.894420166015625e+02, 2.893913879394531e+02, 2.893407592773438e+02, 2.892901306152344e+02, 2.89239501953125e+02, 2.891889038085938e+02, 2.891382751464844e+02, 2.89087646484375e+02, 2.890370483398438e+02, 2.889864196777344e+02, 2.889358215332031e+02, 2.888852233886719e+02, 2.888345947265625e+02, 2.887839965820312e+02, 2.887333984375e+02, 2.886828002929688e+02, 2.886321716308594e+02, 2.885815734863281e+02, 2.885309753417969e+02, 2.884803771972656e+02, 2.884298095703125e+02, 2.883792114257812e+02, 2.8832861328125e+02, 2.882780151367188e+02, 2.882274475097656e+02, 2.881768493652344e+02, 2.881262817382812e+02]
+hea4.sta_b.T=[2.931499938964844e+02, 2.931437072753906e+02, 2.930921325683594e+02, 2.930411376953125e+02, 2.929902954101562e+02, 2.929395141601562e+02, 2.928887634277344e+02, 2.928380126953125e+02, 2.927872619628906e+02, 2.927365417480469e+02, 2.92685791015625e+02, 2.926350402832031e+02, 2.925843200683594e+02, 2.925335693359375e+02, 2.924828491210938e+02, 2.924320983886719e+02, 2.923813781738281e+02, 2.923306579589844e+02, 2.922799377441406e+02, 2.922291870117188e+02, 2.92178466796875e+02, 2.921277465820312e+02, 2.920770263671875e+02, 2.920263061523438e+02, 2.919755859375e+02, 2.919248962402344e+02, 2.918741760253906e+02, 2.918234558105469e+02, 2.917727661132812e+02, 2.917220458984375e+02, 2.916713256835938e+02, 2.916206359863281e+02, 2.915699462890625e+02, 2.915192260742188e+02, 2.914685363769531e+02, 2.914178466796875e+02, 2.913671569824219e+02, 2.913164367675781e+02, 2.912657470703125e+02, 2.912150573730469e+02, 2.911643676757812e+02, 2.911136779785156e+02, 2.910630187988281e+02, 2.910123291015625e+02, 2.909616394042969e+02, 2.909109497070312e+02, 2.908602905273438e+02, 2.908096008300781e+02, 2.907589416503906e+02, 2.90708251953125e+02, 2.906575927734375e+02, 2.9060693359375e+02, 2.905562438964844e+02, 2.905055847167969e+02, 2.904549255371094e+02, 2.904042663574219e+02, 2.903536071777344e+02, 2.903029479980469e+02, 2.902522888183594e+02, 2.902016296386719e+02, 2.901509704589844e+02, 2.90100341796875e+02, 2.900496826171875e+02, 2.899990234375e+02, 2.899483947753906e+02, 2.898977355957031e+02, 2.898471069335938e+02, 2.897964477539062e+02, 2.897458190917969e+02, 2.896951904296875e+02, 2.8964453125e+02, 2.895939025878906e+02, 2.895432739257812e+02, 2.894926452636719e+02, 2.894420166015625e+02, 2.893913879394531e+02, 2.893407592773438e+02, 2.892901306152344e+02, 2.89239501953125e+02, 2.891889038085938e+02, 2.891382751464844e+02, 2.89087646484375e+02, 2.890370483398438e+02, 2.889864196777344e+02, 2.889358215332031e+02, 2.888852233886719e+02, 2.888345947265625e+02, 2.887839965820312e+02, 2.887333984375e+02, 2.886828002929688e+02, 2.886321716308594e+02, 2.885815734863281e+02, 2.885309753417969e+02, 2.884803771972656e+02, 2.884298095703125e+02, 2.883792114257812e+02, 2.8832861328125e+02, 2.882780151367188e+02, 2.882274475097656e+02, 2.881768493652344e+02, 2.881262817382812e+02]
+hea4.sta_a.T=[2.931499938964844e+02, 2.931946716308594e+02, 2.931941528320312e+02, 2.931936645507812e+02, 2.931934509277344e+02, 2.931933288574219e+02, 2.931932983398438e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02]
+hea1.m_flow=[7.071067690849304e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01]
+hea2.m_flow=[0e+00, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01]
+hea4.m_flow=[-0e+00, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01]
+hea3.m_flow=[7.071067690849304e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01]
+hea5.sta_a.T=[2.931499938964844e+02, 2.931939086914062e+02, 2.931925659179688e+02, 2.931918640136719e+02, 2.931915588378906e+02, 2.931914672851562e+02, 2.9319140625e+02, 2.9319140625e+02, 2.9319140625e+02, 2.9319140625e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02, 2.931913757324219e+02]
+hea6.sta_b.T=[2.931499938964844e+02, 2.931428833007812e+02, 2.930924682617188e+02, 2.930425720214844e+02, 2.929928588867188e+02, 2.929432067871094e+02, 2.928935852050781e+02, 2.928439331054688e+02, 2.927943115234375e+02, 2.927446899414062e+02, 2.92695068359375e+02, 2.926454467773438e+02, 2.925958251953125e+02, 2.925462036132812e+02, 2.9249658203125e+02, 2.924469604492188e+02, 2.923973388671875e+02, 2.923477172851562e+02, 2.922981262207031e+02, 2.922485046386719e+02, 2.921988830566406e+02, 2.921492919921875e+02, 2.920996704101562e+02, 2.920500793457031e+02, 2.9200048828125e+02, 2.919508666992188e+02, 2.919012756347656e+02, 2.918516845703125e+02, 2.918020935058594e+02, 2.917525024414062e+02, 2.91702880859375e+02, 2.916533203125e+02, 2.916037292480469e+02, 2.915541381835938e+02, 2.915045471191406e+02, 2.914549560546875e+02, 2.914053649902344e+02, 2.913558044433594e+02, 2.913062133789062e+02, 2.912566528320312e+02, 2.912070617675781e+02, 2.911575012207031e+02, 2.9110791015625e+02, 2.91058349609375e+02, 2.910087890625e+02, 2.909591979980469e+02, 2.909096374511719e+02, 2.908600769042969e+02, 2.908105163574219e+02, 2.907609558105469e+02, 2.907113952636719e+02, 2.906618347167969e+02, 2.906122741699219e+02, 2.90562744140625e+02, 2.9051318359375e+02, 2.90463623046875e+02, 2.904140930175781e+02, 2.903645324707031e+02, 2.903150024414062e+02, 2.902654418945312e+02, 2.902159118652344e+02, 2.901663513183594e+02, 2.901168212890625e+02, 2.900672912597656e+02, 2.900177612304688e+02, 2.899682312011719e+02, 2.89918701171875e+02, 2.89869140625e+02, 2.898196411132812e+02, 2.897701110839844e+02, 2.897205810546875e+02, 2.896710510253906e+02, 2.896215209960938e+02, 2.89572021484375e+02, 2.895224914550781e+02, 2.894729614257812e+02, 2.894234619140625e+02, 2.893739318847656e+02, 2.893244323730469e+02, 2.892749328613281e+02, 2.892254028320312e+02, 2.891759033203125e+02, 2.891264038085938e+02, 2.89076904296875e+02, 2.890274047851562e+02, 2.889779052734375e+02, 2.889284057617188e+02, 2.8887890625e+02, 2.888294067382812e+02, 2.887799072265625e+02, 2.887304077148438e+02, 2.88680908203125e+02, 2.886314392089844e+02, 2.885819396972656e+02, 2.88532470703125e+02, 2.884829711914062e+02, 2.884335021972656e+02, 2.883840026855469e+02, 2.883345336914062e+02, 2.882850646972656e+02, 2.88235595703125e+02]
+hea5.sta_b.T=[2.931499938964844e+02, 2.931428833007812e+02, 2.930924682617188e+02, 2.930425720214844e+02, 2.929928588867188e+02, 2.929432067871094e+02, 2.928935852050781e+02, 2.928439331054688e+02, 2.927943115234375e+02, 2.927446899414062e+02, 2.92695068359375e+02, 2.926454467773438e+02, 2.925958251953125e+02, 2.925462036132812e+02, 2.9249658203125e+02, 2.924469604492188e+02, 2.923973388671875e+02, 2.923477172851562e+02, 2.922981262207031e+02, 2.922485046386719e+02, 2.921988830566406e+02, 2.921492919921875e+02, 2.920996704101562e+02, 2.920500793457031e+02, 2.9200048828125e+02, 2.919508666992188e+02, 2.919012756347656e+02, 2.918516845703125e+02, 2.918020935058594e+02, 2.917525024414062e+02, 2.91702880859375e+02, 2.916533203125e+02, 2.916037292480469e+02, 2.915541381835938e+02, 2.915045471191406e+02, 2.914549560546875e+02, 2.914053649902344e+02, 2.913558044433594e+02, 2.913062133789062e+02, 2.912566528320312e+02, 2.912070617675781e+02, 2.911575012207031e+02, 2.9110791015625e+02, 2.91058349609375e+02, 2.910087890625e+02, 2.909591979980469e+02, 2.909096374511719e+02, 2.908600769042969e+02, 2.908105163574219e+02, 2.907609558105469e+02, 2.907113952636719e+02, 2.906618347167969e+02, 2.906122741699219e+02, 2.90562744140625e+02, 2.9051318359375e+02, 2.90463623046875e+02, 2.904140930175781e+02, 2.903645324707031e+02, 2.903150024414062e+02, 2.902654418945312e+02, 2.902159118652344e+02, 2.901663513183594e+02, 2.901168212890625e+02, 2.900672912597656e+02, 2.900177612304688e+02, 2.899682312011719e+02, 2.89918701171875e+02, 2.89869140625e+02, 2.898196411132812e+02, 2.897701110839844e+02, 2.897205810546875e+02, 2.896710510253906e+02, 2.896215209960938e+02, 2.89572021484375e+02, 2.895224914550781e+02, 2.894729614257812e+02, 2.894234619140625e+02, 2.893739318847656e+02, 2.893244323730469e+02, 2.892749328613281e+02, 2.892254028320312e+02, 2.891759033203125e+02, 2.891264038085938e+02, 2.89076904296875e+02, 2.890274047851562e+02, 2.889779052734375e+02, 2.889284057617188e+02, 2.8887890625e+02, 2.888294067382812e+02, 2.887799072265625e+02, 2.887304077148438e+02, 2.88680908203125e+02, 2.886314392089844e+02, 2.885819396972656e+02, 2.88532470703125e+02, 2.884829711914062e+02, 2.884335021972656e+02, 2.883840026855469e+02, 2.883345336914062e+02, 2.882850646972656e+02, 2.88235595703125e+02]
+hea8.sta_a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+mix2.T=[2.931499938964844e+02, 2.931437072753906e+02, 2.930921325683594e+02, 2.930411376953125e+02, 2.929902954101562e+02, 2.929395141601562e+02, 2.928887634277344e+02, 2.928380126953125e+02, 2.927872619628906e+02, 2.927365417480469e+02, 2.92685791015625e+02, 2.926350402832031e+02, 2.925843200683594e+02, 2.925335693359375e+02, 2.924828491210938e+02, 2.924320983886719e+02, 2.923813781738281e+02, 2.923306579589844e+02, 2.922799377441406e+02, 2.922291870117188e+02, 2.92178466796875e+02, 2.921277465820312e+02, 2.920770263671875e+02, 2.920263061523438e+02, 2.919755859375e+02, 2.919248962402344e+02, 2.918741760253906e+02, 2.918234558105469e+02, 2.917727661132812e+02, 2.917220458984375e+02, 2.916713256835938e+02, 2.916206359863281e+02, 2.915699462890625e+02, 2.915192260742188e+02, 2.914685363769531e+02, 2.914178466796875e+02, 2.913671569824219e+02, 2.913164367675781e+02, 2.912657470703125e+02, 2.912150573730469e+02, 2.911643676757812e+02, 2.911136779785156e+02, 2.910630187988281e+02, 2.910123291015625e+02, 2.909616394042969e+02, 2.909109497070312e+02, 2.908602905273438e+02, 2.908096008300781e+02, 2.907589416503906e+02, 2.90708251953125e+02, 2.906575927734375e+02, 2.9060693359375e+02, 2.905562438964844e+02, 2.905055847167969e+02, 2.904549255371094e+02, 2.904042663574219e+02, 2.903536071777344e+02, 2.903029479980469e+02, 2.902522888183594e+02, 2.902016296386719e+02, 2.901509704589844e+02, 2.90100341796875e+02, 2.900496826171875e+02, 2.899990234375e+02, 2.899483947753906e+02, 2.898977355957031e+02, 2.898471069335938e+02, 2.897964477539062e+02, 2.897458190917969e+02, 2.896951904296875e+02, 2.8964453125e+02, 2.895939025878906e+02, 2.895432739257812e+02, 2.894926452636719e+02, 2.894420166015625e+02, 2.893913879394531e+02, 2.893407592773438e+02, 2.892901306152344e+02, 2.89239501953125e+02, 2.891889038085938e+02, 2.891382751464844e+02, 2.89087646484375e+02, 2.890370483398438e+02, 2.889864196777344e+02, 2.889358215332031e+02, 2.888852233886719e+02, 2.888345947265625e+02, 2.887839965820312e+02, 2.887333984375e+02, 2.886828002929688e+02, 2.886321716308594e+02, 2.885815734863281e+02, 2.885309753417969e+02, 2.884803771972656e+02, 2.884298095703125e+02, 2.883792114257812e+02, 2.8832861328125e+02, 2.882780151367188e+02, 2.882274475097656e+02, 2.881768493652344e+02, 2.881262817382812e+02]
+hea7.sta_a.T=[2.931499938964844e+02, 2.931946716308594e+02, 2.931941528320312e+02, 2.931936645507812e+02, 2.931934509277344e+02, 2.931933288574219e+02, 2.931932983398438e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02, 2.931932678222656e+02]
+hea7.sta_b.T=[2.931499938964844e+02, 2.931437072753906e+02, 2.930921325683594e+02, 2.930411376953125e+02, 2.929902954101562e+02, 2.929395141601562e+02, 2.928887634277344e+02, 2.928380126953125e+02, 2.927872619628906e+02, 2.927365417480469e+02, 2.92685791015625e+02, 2.926350402832031e+02, 2.925843200683594e+02, 2.925335693359375e+02, 2.924828491210938e+02, 2.924320983886719e+02, 2.923813781738281e+02, 2.923306579589844e+02, 2.922799377441406e+02, 2.922291870117188e+02, 2.92178466796875e+02, 2.921277465820312e+02, 2.920770263671875e+02, 2.920263061523438e+02, 2.919755859375e+02, 2.919248962402344e+02, 2.918741760253906e+02, 2.918234558105469e+02, 2.917727661132812e+02, 2.917220458984375e+02, 2.916713256835938e+02, 2.916206359863281e+02, 2.915699462890625e+02, 2.915192260742188e+02, 2.914685363769531e+02, 2.914178466796875e+02, 2.913671569824219e+02, 2.913164367675781e+02, 2.912657470703125e+02, 2.912150573730469e+02, 2.911643676757812e+02, 2.911136779785156e+02, 2.910630187988281e+02, 2.910123291015625e+02, 2.909616394042969e+02, 2.909109497070312e+02, 2.908602905273438e+02, 2.908096008300781e+02, 2.907589416503906e+02, 2.90708251953125e+02, 2.906575927734375e+02, 2.9060693359375e+02, 2.905562438964844e+02, 2.905055847167969e+02, 2.904549255371094e+02, 2.904042663574219e+02, 2.903536071777344e+02, 2.903029479980469e+02, 2.902522888183594e+02, 2.902016296386719e+02, 2.901509704589844e+02, 2.90100341796875e+02, 2.900496826171875e+02, 2.899990234375e+02, 2.899483947753906e+02, 2.898977355957031e+02, 2.898471069335938e+02, 2.897964477539062e+02, 2.897458190917969e+02, 2.896951904296875e+02, 2.8964453125e+02, 2.895939025878906e+02, 2.895432739257812e+02, 2.894926452636719e+02, 2.894420166015625e+02, 2.893913879394531e+02, 2.893407592773438e+02, 2.892901306152344e+02, 2.89239501953125e+02, 2.891889038085938e+02, 2.891382751464844e+02, 2.89087646484375e+02, 2.890370483398438e+02, 2.889864196777344e+02, 2.889358215332031e+02, 2.888852233886719e+02, 2.888345947265625e+02, 2.887839965820312e+02, 2.887333984375e+02, 2.886828002929688e+02, 2.886321716308594e+02, 2.885815734863281e+02, 2.885309753417969e+02, 2.884803771972656e+02, 2.884298095703125e+02, 2.883792114257812e+02, 2.8832861328125e+02, 2.882780151367188e+02, 2.882274475097656e+02, 2.881768493652344e+02, 2.881262817382812e+02]
+hea8.sta_b.T=[2.931499938964844e+02, 2.931437072753906e+02, 2.930921325683594e+02, 2.930411376953125e+02, 2.929902954101562e+02, 2.929395141601562e+02, 2.928887634277344e+02, 2.928380126953125e+02, 2.927872619628906e+02, 2.927365417480469e+02, 2.92685791015625e+02, 2.926350402832031e+02, 2.925843200683594e+02, 2.925335693359375e+02, 2.924828491210938e+02, 2.924320983886719e+02, 2.923813781738281e+02, 2.923306579589844e+02, 2.922799377441406e+02, 2.922291870117188e+02, 2.92178466796875e+02, 2.921277465820312e+02, 2.920770263671875e+02, 2.920263061523438e+02, 2.919755859375e+02, 2.919248962402344e+02, 2.918741760253906e+02, 2.918234558105469e+02, 2.917727661132812e+02, 2.917220458984375e+02, 2.916713256835938e+02, 2.916206359863281e+02, 2.915699462890625e+02, 2.915192260742188e+02, 2.914685363769531e+02, 2.914178466796875e+02, 2.913671569824219e+02, 2.913164367675781e+02, 2.912657470703125e+02, 2.912150573730469e+02, 2.911643676757812e+02, 2.911136779785156e+02, 2.910630187988281e+02, 2.910123291015625e+02, 2.909616394042969e+02, 2.909109497070312e+02, 2.908602905273438e+02, 2.908096008300781e+02, 2.907589416503906e+02, 2.90708251953125e+02, 2.906575927734375e+02, 2.9060693359375e+02, 2.905562438964844e+02, 2.905055847167969e+02, 2.904549255371094e+02, 2.904042663574219e+02, 2.903536071777344e+02, 2.903029479980469e+02, 2.902522888183594e+02, 2.902016296386719e+02, 2.901509704589844e+02, 2.90100341796875e+02, 2.900496826171875e+02, 2.899990234375e+02, 2.899483947753906e+02, 2.898977355957031e+02, 2.898471069335938e+02, 2.897964477539062e+02, 2.897458190917969e+02, 2.896951904296875e+02, 2.8964453125e+02, 2.895939025878906e+02, 2.895432739257812e+02, 2.894926452636719e+02, 2.894420166015625e+02, 2.893913879394531e+02, 2.893407592773438e+02, 2.892901306152344e+02, 2.89239501953125e+02, 2.891889038085938e+02, 2.891382751464844e+02, 2.89087646484375e+02, 2.890370483398438e+02, 2.889864196777344e+02, 2.889358215332031e+02, 2.888852233886719e+02, 2.888345947265625e+02, 2.887839965820312e+02, 2.887333984375e+02, 2.886828002929688e+02, 2.886321716308594e+02, 2.885815734863281e+02, 2.885309753417969e+02, 2.884803771972656e+02, 2.884298095703125e+02, 2.883792114257812e+02, 2.8832861328125e+02, 2.882780151367188e+02, 2.882274475097656e+02, 2.881768493652344e+02, 2.881262817382812e+02]
+hea5.m_flow=[-0e+00, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01]
+hea6.m_flow=[7.071067690849304e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01]
+hea7.m_flow=[-0e+00, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01, -4.890096485614777e-01]
+hea8.m_flow=[7.071067690849304e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01, 4.890096485614777e-01]
+che17.y=[0e+00, 9.627906111253637e-13, 1.261050291967436e-12, 1.352792877717945e-12, 1.381204178807494e-12, 1.390419029911882e-12, 1.393482551570457e-12, 1.394294402157215e-12, 1.39446440505786e-12, 1.394568488466419e-12, 1.39463267323503e-12, 1.39465869408717e-12, 1.394676041321929e-12, 1.394679510768881e-12, 1.394676041321929e-12, 1.394674306598453e-12, 1.394674306598453e-12, 1.394670837151502e-12, 1.394669102428026e-12, 1.39466736770455e-12, 1.394663898257598e-12, 1.394662163534122e-12, 1.394663898257598e-12, 1.394660428810646e-12, 1.394663898257598e-12, 1.394662163534122e-12, 1.394662163534122e-12, 1.394663898257598e-12, 1.394660428810646e-12, 1.394663898257598e-12, 1.394662163534122e-12, 1.394663898257598e-12, 1.394662163534122e-12, 1.394662163534122e-12, 1.394662163534122e-12, 1.394663898257598e-12, 1.394662163534122e-12, 1.394662163534122e-12, 1.394663898257598e-12, 1.394662163534122e-12, 1.394660428810646e-12, 1.394660428810646e-12, 1.394660428810646e-12, 1.394662163534122e-12, 1.394660428810646e-12, 1.394662163534122e-12, 1.394660428810646e-12, 1.394660428810646e-12, 1.394662163534122e-12, 1.394660428810646e-12, 1.394662163534122e-12, 1.394660428810646e-12, 1.394660428810646e-12, 1.394660428810646e-12, 1.394662163534122e-12, 1.39465869408717e-12, 1.394660428810646e-12, 1.394660428810646e-12, 1.394662163534122e-12, 1.394660428810646e-12, 1.394660428810646e-12, 1.394660428810646e-12, 1.394660428810646e-12, 1.394662163534122e-12, 1.39465869408717e-12, 1.394660428810646e-12, 1.394660428810646e-12, 1.394662163534122e-12, 1.394660428810646e-12, 1.394660428810646e-12, 1.394662163534122e-12, 1.394660428810646e-12, 1.394662163534122e-12, 1.394662163534122e-12, 1.394662163534122e-12, 1.394660428810646e-12, 1.394662163534122e-12, 1.394662163534122e-12, 1.394663898257598e-12, 1.394662163534122e-12, 1.394662163534122e-12, 1.394663898257598e-12, 1.394663898257598e-12, 1.394663898257598e-12, 1.394662163534122e-12, 1.394663898257598e-12, 1.394663898257598e-12, 1.394663898257598e-12, 1.394662163534122e-12, 1.394663898257598e-12, 1.394663898257598e-12, 1.394663898257598e-12, 1.394662163534122e-12, 1.394663898257598e-12, 1.394663898257598e-12, 1.394663898257598e-12, 1.394663898257598e-12, 1.394665632981074e-12, 1.394663898257598e-12, 1.394663898257598e-12, 1.394663898257598e-12]
+che12.y=[0e+00, -5.623364813800436e-06, -1.152446020569187e-05, -1.457052894693334e-05, -1.586880534887314e-05, -1.637736932025291e-05, -1.657398024690337e-05, -1.663941839069594e-05, -1.665941272221971e-05, -1.666827665758319e-05, -1.667308970354497e-05, -1.667523247306235e-05, -1.667662399995606e-05, -1.667723518039566e-05, -1.667697688390035e-05, -1.667678770900238e-05, -1.667659853410441e-05, -1.667640935920645e-05, -1.667622018430848e-05, -1.667603100941051e-05, -1.667588730924763e-05, -1.66758727573324e-05, -1.667585820541717e-05, -1.667584365350194e-05, -1.667582910158671e-05, -1.667581636866089e-05, -1.667580181674566e-05, -1.667578726483043e-05, -1.66757727129152e-05, -1.667575816099998e-05, -1.667574542807415e-05, -1.667573087615892e-05, -1.667572541919071e-05, -1.667572541919071e-05, -1.667572541919071e-05, -1.667572541919071e-05, -1.667572360020131e-05, -1.667572360020131e-05, -1.667572360020131e-05, -1.667572178121191e-05, -1.667572178121191e-05, -1.667572178121191e-05, -1.66757199622225e-05, -1.66757199622225e-05, -1.66757199622225e-05, -1.66757199622225e-05, -1.66757181432331e-05, -1.66757181432331e-05, -1.66757181432331e-05, -1.667571632424369e-05, -1.667571632424369e-05, -1.667571632424369e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571450525429e-05, -1.667571268626489e-05, -1.667571268626489e-05, -1.667571268626489e-05, -1.667571268626489e-05, -1.667571268626489e-05, -1.667571268626489e-05, -1.667571268626489e-05, -1.667571268626489e-05, -1.667571268626489e-05, -1.667571268626489e-05, -1.667571268626489e-05, -1.667571268626489e-05]
+che19.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.734723475976807e-18, 0e+00, 6.847739303575774e-33, -1.734723475976807e-18, -1.734723475976807e-18, 1.734723475976807e-18, 0e+00, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 0e+00, 1.734723475976807e-18, 0e+00, 1.734723475976807e-18, 1.734723475976807e-18, 0e+00, 3.469446951953614e-18, 1.734723475976807e-18, 1.734723475976807e-18, 3.469446951953614e-18, 1.734723475976807e-18, 3.469446951953614e-18, 5.204170427930421e-18, 5.204170427930421e-18, 3.469446951953614e-18, 5.204170427930421e-18, 3.469446951953614e-18, 5.204170427930421e-18, 6.938893903907228e-18, 5.204170427930421e-18, 5.204170427930421e-18, 5.204170427930421e-18, 5.204170427930421e-18, 5.204170427930421e-18, 3.469446951953614e-18, 1.734723475976807e-18, 1.734723475976807e-18, 3.469446951953614e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 0e+00, 3.469446951953614e-18, 1.734723475976807e-18, 0e+00, 0e+00, 1.734723475976807e-18, 0e+00, 0e+00, 1.734723475976752e-18, 1.734723475976752e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 3.469446951953614e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18, 1.734723475976807e-18]
+che16.y=[0e+00, 5.623364813800436e-06, 1.152446020569187e-05, 1.457052894693334e-05, 1.586880534887314e-05, 1.637736932025291e-05, 1.657398024690337e-05, 1.663941839069594e-05, 1.665941272221971e-05, 1.666827665758319e-05, 1.667308970354497e-05, 1.667523247306235e-05, 1.667662399995606e-05, 1.667723518039566e-05, 1.667697688390035e-05, 1.667678770900238e-05, 1.667659853410441e-05, 1.667640935920645e-05, 1.667622018430848e-05, 1.667603100941051e-05, 1.667588730924763e-05, 1.66758727573324e-05, 1.667585820541717e-05, 1.667584365350194e-05, 1.667582910158671e-05, 1.667581636866089e-05, 1.667580181674566e-05, 1.667578726483043e-05, 1.66757727129152e-05, 1.667575816099998e-05, 1.667574542807415e-05, 1.667573087615892e-05, 1.667572541919071e-05, 1.667572541919071e-05, 1.667572541919071e-05, 1.667572541919071e-05, 1.667572360020131e-05, 1.667572360020131e-05, 1.667572360020131e-05, 1.667572178121191e-05, 1.667572178121191e-05, 1.667572178121191e-05, 1.66757199622225e-05, 1.66757199622225e-05, 1.66757199622225e-05, 1.66757199622225e-05, 1.66757181432331e-05, 1.66757181432331e-05, 1.66757181432331e-05, 1.667571632424369e-05, 1.667571632424369e-05, 1.667571632424369e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571450525429e-05, 1.667571268626489e-05, 1.667571268626489e-05, 1.667571268626489e-05, 1.667571268626489e-05, 1.667571268626489e-05, 1.667571268626489e-05, 1.667571268626489e-05, 1.667571268626489e-05, 1.667571268626489e-05, 1.667571268626489e-05, 1.667571268626489e-05, 1.667571268626489e-05]
+che18.y=[0e+00, 5.712297934223898e-06, 1.18452990136575e-05, 1.509409776190296e-05, 1.651529964874499e-05, 1.708614945528097e-05, 1.731160773488227e-05, 1.738921309879515e-05, 1.741408777888864e-05, 1.742503263812978e-05, 1.7430893421988e-05, 1.743352549965493e-05, 1.743523716868367e-05, 1.743599023029674e-05, 1.743567736411933e-05, 1.743544453347567e-05, 1.743520988384262e-05, 1.743497705319896e-05, 1.743474240356591e-05, 1.743450957292225e-05, 1.74343313119607e-05, 1.743431312206667e-05, 1.743429493217263e-05, 1.7434278561268e-05, 1.743426037137397e-05, 1.743424218147993e-05, 1.74342239915859e-05, 1.743420580169186e-05, 1.743418761179782e-05, 1.743417124089319e-05, 1.743415305099916e-05, 1.743413486110512e-05, 1.743412940413691e-05, 1.743412940413691e-05, 1.743412758514751e-05, 1.743412758514751e-05, 1.74341257661581e-05, 1.74341257661581e-05, 1.74341257661581e-05, 1.74341239471687e-05, 1.74341239471687e-05, 1.74341239471687e-05, 1.74341221281793e-05, 1.74341221281793e-05, 1.743412030918989e-05, 1.743412030918989e-05, 1.743412030918989e-05, 1.743411849020049e-05, 1.743411849020049e-05, 1.743411667121109e-05, 1.743411667121109e-05, 1.743411667121109e-05, 1.743411485222168e-05, 1.743411485222168e-05, 1.743411485222168e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05, 1.743411303323228e-05]
+che1.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+che4.y=[0e+00, 4.465994238853455e-02, 4.413914307951927e-02, 4.367516934871674e-02, 4.343890398740768e-02, 4.333775863051414e-02, 4.329617694020271e-02, 4.328116402029991e-02, 4.327611997723579e-02, 4.327397048473358e-02, 4.327283799648285e-02, 4.327232390642166e-02, 4.32719886302948e-02, 4.327184334397316e-02, 4.327190294861794e-02, 4.327194765210152e-02, 4.32719960808754e-02, 4.327204078435898e-02, 4.327208548784256e-02, 4.327213391661644e-02, 4.327216744422913e-02, 4.327217116951942e-02, 4.327217489480972e-02, 4.327217862010002e-02, 4.327218234539032e-02, 4.327218607068062e-02, 4.327218979597092e-02, 4.327219352126122e-02, 4.327219724655151e-02, 4.327219724655151e-02, 4.327220097184181e-02, 4.327220469713211e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327220842242241e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02, 4.327221214771271e-02]
+che11.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+che5.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+che8.y=[0e+00, -4.465994238853455e-02, -4.413914307951927e-02, -4.367516934871674e-02, -4.343890398740768e-02, -4.333775863051414e-02, -4.329617694020271e-02, -4.328116402029991e-02, -4.327611997723579e-02, -4.327397048473358e-02, -4.327283799648285e-02, -4.327232390642166e-02, -4.32719886302948e-02, -4.327184334397316e-02, -4.327190294861794e-02, -4.327194765210152e-02, -4.32719960808754e-02, -4.327204078435898e-02, -4.327208548784256e-02, -4.327213391661644e-02, -4.327216744422913e-02, -4.327217116951942e-02, -4.327217489480972e-02, -4.327217862010002e-02, -4.327218234539032e-02, -4.327218607068062e-02, -4.327218979597092e-02, -4.327219352126122e-02, -4.327219724655151e-02, -4.327219724655151e-02, -4.327220097184181e-02, -4.327220469713211e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327220842242241e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02, -4.327221214771271e-02]
+che15.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+che10.y=[0e+00, 9.737277650856413e-11, 3.024069883394986e-11, 9.663381206337363e-12, 3.240074875066057e-12, 1.13686837721616e-12, 3.410605131648481e-13, 2.273736754432321e-13, 1.13686837721616e-13, 2.273736754432321e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.13686837721616e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.705302565824231e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.13686837721616e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.13686837721616e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.705302565824223e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.13686837721616e-13, 1.70530256582424e-13, 1.13686837721616e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.13686837721616e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.13686837721616e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.13686837721616e-13, 1.70530256582424e-13, 1.13686837721616e-13, 1.70530256582424e-13, 1.13686837721616e-13, 1.13686837721616e-13, 1.70530256582424e-13, 1.13686837721616e-13, 1.70530256582424e-13, 1.13686837721616e-13, 1.13686837721616e-13, 1.70530256582424e-13, 1.13686837721616e-13, 1.70530256582424e-13, 1.13686837721616e-13, 1.13686837721616e-13, 1.70530256582424e-13, 1.13686837721616e-13, 1.70530256582424e-13, 1.70530256582424e-13, 1.13686837721616e-13, 1.70530256582424e-13, 1.13686837721616e-13, 1.70530256582424e-13, 1.13686837721616e-13, 1.13686837721616e-13, 1.70530256582424e-13]
+che9.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.684341886080801e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.684341886080801e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.684341886080801e-14, 0e+00, 0e+00, 0e+00, 0e+00, -5.684341886080801e-14, 0e+00, 0e+00, 0e+00, 0e+00, -5.684341886080801e-14, -5.684341886080801e-14, -5.684341886080801e-14, 0e+00, 0e+00, 0e+00, 0e+00, -5.684341886080801e-14, -5.684341886080801e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.684341886080801e-14, 0e+00, 0e+00, 0e+00, 5.684341886080801e-14, 0e+00, 0e+00, 0e+00, 0e+00, -5.684341886080622e-14, 5.684341886080801e-14, 0e+00, 5.684341886080801e-14, 0e+00, 0e+00, 5.684341886080801e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.684341886080801e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.684341886080801e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+che2.y=[0e+00, 4.390408843755722e-02, 4.256340861320496e-02, 4.186975583434105e-02, 4.157383367419243e-02, 4.145786538720131e-02, 4.141302034258842e-02, 4.139808937907219e-02, 4.139352217316628e-02, 4.139149934053421e-02, 4.139040410518646e-02, 4.138991236686707e-02, 4.13895957171917e-02, 4.138945788145065e-02, 4.138951748609543e-02, 4.138955846428871e-02, 4.138960316777229e-02, 4.138964414596558e-02, 4.138968884944916e-02, 4.138973355293274e-02, 4.138976335525513e-02, 4.138976708054543e-02, 4.138977080583572e-02, 4.138977453112602e-02, 4.138977825641632e-02, 4.138978198170662e-02, 4.138978570699692e-02, 4.138978570699692e-02, 4.138978943228722e-02, 4.138979315757751e-02, 4.138979688286781e-02, 4.138980060815811e-02, 4.138980060815811e-02, 4.138980060815811e-02, 4.138980060815811e-02, 4.138980060815811e-02, 4.138980060815811e-02, 4.138980060815811e-02, 4.138980060815811e-02, 4.138980060815811e-02, 4.138980060815811e-02, 4.138980060815811e-02, 4.138980060815811e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02, 4.138980433344841e-02]
+che3.y=[0e+00, 3.558000116754556e-09, 3.491379629849689e-09, 3.470745468803216e-09, 3.464322162471944e-09, 3.462162112555234e-09, 3.461366304691182e-09, 3.461025244178018e-09, 3.460911557340296e-09, 3.460741027083714e-09, 3.460684183664853e-09, 3.46051365340827e-09, 3.460399966570549e-09, 3.460286279732827e-09, 3.460115749476245e-09, 3.460058906057384e-09, 3.459945219219662e-09, 3.45977468896308e-09, 3.459661002125358e-09, 3.459547315287637e-09, 3.459433628449915e-09, 3.459319941612193e-09, 3.459206254774472e-09, 3.45909256793675e-09, 3.458978881099029e-09, 3.458808350842446e-09, 3.458694664004724e-09, 3.458637820585864e-09, 3.458524133748142e-09, 3.45841044691042e-09, 3.458239916653838e-09, 3.458126229816116e-09, 3.458012542978395e-09, 3.457898856140673e-09, 3.457785169302952e-09, 3.457614639046369e-09, 3.457500952208648e-09, 3.457444108789787e-09, 3.457330421952065e-09, 3.457159891695483e-09, 3.457046204857761e-09, 3.4569893614389e-09, 3.456818831182318e-09, 3.456705144344596e-09, 3.456591457506875e-09, 3.456477770669153e-09, 3.456364083831431e-09, 3.45625039699371e-09, 3.456136710155988e-09, 3.456023023318266e-09, 3.455852493061684e-09, 3.455738806223962e-09, 3.455681962805102e-09, 3.455511432548519e-09, 3.455397745710798e-09, 3.455284058873076e-09, 3.455113528616494e-09, 3.455056685197633e-09, 3.45488615494105e-09, 3.454772468103329e-09, 3.454715624684468e-09, 3.454601937846746e-09, 3.454431407590164e-09, 3.454317720752442e-09, 3.454260877333581e-09, 3.454090347076999e-09, 3.453976660239277e-09, 3.453806129982695e-09, 3.453692443144973e-09, 3.453635599726113e-09, 3.453521912888391e-09, 3.453408226050669e-09, 3.453237695794087e-09, 3.453124008956365e-09, 3.453010322118644e-09, 3.452896635280922e-09, 3.4527829484432e-09, 3.452669261605479e-09, 3.452555574767757e-09, 3.452385044511175e-09, 3.452328201092314e-09, 3.452214514254592e-09, 3.452100827416871e-09, 3.451987140579149e-09, 3.451873453741428e-09, 3.451702923484845e-09, 3.451589236647123e-09, 3.451475549809402e-09, 3.45136186297168e-09, 3.451248176133959e-09, 3.451134489296237e-09, 3.451020802458515e-09, 3.450850272201933e-09, 3.450793428783072e-09, 3.450679741945351e-09, 3.450509211688768e-09, 3.450395524851047e-09, 3.450281838013325e-09, 3.450168151175603e-09, 3.450054464337882e-09, 3.44994077750016e-09]
+che6.y=[0e+00, -4.390408843755722e-02, -4.256340861320496e-02, -4.186975583434105e-02, -4.157383367419243e-02, -4.145786538720131e-02, -4.141302034258842e-02, -4.139808937907219e-02, -4.139352217316628e-02, -4.139149934053421e-02, -4.139040410518646e-02, -4.138991236686707e-02, -4.13895957171917e-02, -4.138945788145065e-02, -4.138951748609543e-02, -4.138955846428871e-02, -4.138960316777229e-02, -4.138964414596558e-02, -4.138968884944916e-02, -4.138973355293274e-02, -4.138976335525513e-02, -4.138976708054543e-02, -4.138977080583572e-02, -4.138977453112602e-02, -4.138977825641632e-02, -4.138978198170662e-02, -4.138978570699692e-02, -4.138978570699692e-02, -4.138978943228722e-02, -4.138979315757751e-02, -4.138979688286781e-02, -4.138980060815811e-02, -4.138980060815811e-02, -4.138980060815811e-02, -4.138980060815811e-02, -4.138980060815811e-02, -4.138980060815811e-02, -4.138980060815811e-02, -4.138980060815811e-02, -4.138980060815811e-02, -4.138980060815811e-02, -4.138980060815811e-02, -4.138980060815811e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02, -4.138980433344841e-02]
+che20.y=[0e+00, -1.214306433183765e-17, -3.122502256758253e-17, -5.724587470723463e-17, -6.071532165918825e-17, -9.020562075079397e-17, -5.204170427930421e-17, -4.68375338513738e-17, -4.683753385137379e-17, -9.194034422677078e-17, -8.500145032286355e-17, -7.632783294297951e-17, -6.245004513516506e-17, -5.898059818321144e-17, -5.724587470723463e-17, -5.898059818321144e-17, -6.245004513516506e-17, -6.418476861114186e-17, -6.765421556309548e-17, -6.938893903907228e-17, -7.112366251504909e-17, -7.28583859910259e-17, -6.938893903907228e-17, -6.765421556309548e-17, -6.938893903907228e-17, -6.765421556309548e-17, -6.938893903907228e-17, -6.765421556309545e-17, -6.765421556309548e-17, -6.765421556309548e-17, -6.591949208711867e-17, -6.591949208711867e-17, -6.591949208711867e-17, -6.418476861114186e-17, -6.591949208711867e-17, -6.591949208711867e-17, -6.591949208711867e-17, -6.765421556309548e-17, -6.765421556309548e-17, -6.591949208711867e-17, -6.418476861114186e-17, -6.765421556309548e-17, -6.418476861114186e-17, -6.591949208711867e-17, -6.591949208711867e-17, -6.591949208711867e-17, -6.418476861114186e-17, -6.591949208711867e-17, -6.591949208711867e-17, -6.765421556309548e-17, -6.591949208711867e-17, -6.765421556309548e-17, -6.591949208711867e-17, -6.591949208711867e-17, -6.591949208711867e-17, -6.24500451351651e-17, -6.418476861114186e-17, -6.418476861114186e-17, -6.245004513516506e-17, -6.245004513516506e-17, -6.591949208711867e-17, -6.418476861114186e-17, -6.245004513516506e-17, -6.418476861114186e-17, -6.245004513516506e-17, -6.418476861114186e-17, -6.591949208711867e-17, -6.245004513516506e-17, -6.245004513516506e-17, -6.418476861114186e-17, -6.418476861114186e-17, -6.245004513516506e-17, -6.245004513516506e-17, -6.245004513516506e-17, -6.418476861114186e-17, -6.418476861114186e-17, -6.245004513516506e-17, -6.245004513516506e-17, -6.245004513516506e-17, -6.418476861114186e-17, -6.245004513516506e-17, -6.245004513516506e-17, -6.245004513516506e-17, -6.245004513516506e-17, -6.418476861114186e-17, -6.245004513516506e-17, -6.245004513516506e-17, -6.245004513516506e-17, -6.245004513516506e-17, -6.418476861114186e-17, -6.245004513516506e-17, -6.245004513516506e-17, -6.245004513516506e-17, -6.418476861114186e-17, -6.245004513516506e-17, -6.245004513516506e-17, -6.245004513516506e-17, -6.245004513516506e-17, -6.418476861114186e-17, -6.245004513516506e-17, -6.245004513516506e-17]
+che7.y=[0e+00, -3.557829586497974e-09, -3.491209099593107e-09, -3.470631781965494e-09, -3.464208475634223e-09, -3.461991582298651e-09, -3.461252617853461e-09, -3.460911557340296e-09, -3.460741027083714e-09, -3.460627340245992e-09, -3.46051365340827e-09, -3.460399966570549e-09, -3.460286279732827e-09, -3.460115749476245e-09, -3.460002062638523e-09, -3.459831532381941e-09, -3.45977468896308e-09, -3.459661002125358e-09, -3.459547315287637e-09, -3.459376785031054e-09, -3.459263098193333e-09, -3.459149411355611e-09, -3.459035724517889e-09, -3.458922037680168e-09, -3.458808350842446e-09, -3.458694664004724e-09, -3.458580977167003e-09, -3.45841044691042e-09, -3.458296760072699e-09, -3.458239916653838e-09, -3.458069386397256e-09, -3.458012542978395e-09, -3.457842012721812e-09, -3.457728325884091e-09, -3.457614639046369e-09, -3.457500952208648e-09, -3.457387265370926e-09, -3.457216735114343e-09, -3.457103048276622e-09, -3.4569893614389e-09, -3.456875674601179e-09, -3.456761987763457e-09, -3.456705144344596e-09, -3.456534614088014e-09, -3.456420927250292e-09, -3.456307240412571e-09, -3.456193553574849e-09, -3.456079866737127e-09, -3.455966179899406e-09, -3.455795649642823e-09, -3.455738806223962e-09, -3.455625119386241e-09, -3.455454589129658e-09, -3.455340902291937e-09, -3.455227215454215e-09, -3.455113528616494e-09, -3.454942998359911e-09, -3.45488615494105e-09, -3.454715624684468e-09, -3.454658781265607e-09, -3.454545094427885e-09, -3.454374564171303e-09, -3.454260877333581e-09, -3.454204033914721e-09, -3.454033503658138e-09, -3.453919816820417e-09, -3.453806129982695e-09, -3.453692443144973e-09, -3.453578756307252e-09, -3.45346506946953e-09, -3.453294539212948e-09, -3.453237695794087e-09, -3.453067165537504e-09, -3.453010322118644e-09, -3.452839791862061e-09, -3.45272610502434e-09, -3.452612418186618e-09, -3.452498731348896e-09, -3.452385044511175e-09, -3.452271357673453e-09, -3.452157670835732e-09, -3.45204398399801e-09, -3.451930297160288e-09, -3.451816610322567e-09, -3.451702923484845e-09, -3.451589236647123e-09, -3.451418706390541e-09, -3.451305019552819e-09, -3.451191332715098e-09, -3.451077645877376e-09, -3.450963959039655e-09, -3.450850272201933e-09, -3.450736585364211e-09, -3.45062289852649e-09, -3.450509211688768e-09, -3.450338681432186e-09, -3.450224994594464e-09, -3.450168151175603e-09, -3.450054464337882e-09, -3.449883934081299e-09, -3.449770247243578e-09]
+che13.y=[0e+00, -9.628357139357391e-13, -1.261104068395191e-12, -1.352865736103936e-12, -1.381270098299581e-12, -1.390481479957018e-12, -1.393546736339069e-12, -1.394355117478874e-12, -1.394533793996899e-12, -1.394630938511554e-12, -1.394698592727117e-12, -1.394721144132305e-12, -1.394736756643589e-12, -1.39474889970792e-12, -1.394743695537493e-12, -1.394741960814017e-12, -1.394740226090541e-12, -1.394738491367065e-12, -1.394735021920113e-12, -1.394733287196637e-12, -1.394729817749685e-12, -1.394729817749685e-12, -1.394731552473161e-12, -1.394729817749685e-12, -1.394731552473161e-12, -1.394729817749685e-12, -1.394729817749685e-12, -1.394729817749685e-12, -1.394731552473161e-12, -1.394729817749685e-12, -1.394729817749685e-12, -1.394731552473161e-12, -1.394728083026209e-12, -1.394729817749685e-12, -1.394729817749685e-12, -1.394728083026209e-12, -1.394728083026209e-12, -1.394731552473161e-12, -1.394729817749685e-12, -1.394728083026209e-12, -1.394731552473161e-12, -1.394729817749685e-12, -1.394728083026209e-12, -1.394729817749685e-12, -1.394729817749685e-12, -1.394728083026209e-12, -1.394729817749685e-12, -1.394729817749685e-12, -1.394728083026209e-12, -1.394728083026209e-12, -1.394729817749685e-12, -1.394728083026209e-12, -1.394728083026209e-12, -1.394729817749685e-12, -1.394728083026209e-12, -1.394726348302733e-12, -1.394728083026209e-12, -1.394728083026209e-12, -1.394728083026209e-12, -1.394728083026209e-12, -1.394729817749685e-12, -1.394728083026209e-12, -1.394729817749685e-12, -1.394729817749685e-12, -1.394729817749685e-12, -1.394728083026209e-12, -1.394728083026209e-12, -1.394728083026209e-12, -1.394729817749685e-12, -1.394728083026209e-12, -1.394729817749685e-12, -1.394729817749685e-12, -1.394728083026209e-12, -1.394728083026209e-12, -1.394728083026209e-12, -1.394729817749685e-12, -1.394728083026209e-12, -1.394729817749685e-12, -1.394728083026209e-12, -1.394728083026209e-12, -1.394726348302733e-12, -1.394729817749685e-12, -1.394728083026209e-12, -1.394728083026209e-12, -1.394729817749685e-12, -1.394729817749685e-12, -1.394728083026209e-12, -1.394731552473161e-12, -1.394729817749685e-12, -1.394729817749685e-12, -1.394728083026209e-12, -1.394729817749685e-12, -1.394728083026209e-12, -1.394729817749685e-12, -1.394729817749685e-12, -1.394729817749685e-12, -1.394729817749685e-12, -1.394729817749685e-12, -1.394729817749685e-12, -1.394731552473161e-12, -1.394729817749685e-12]
+che14.y=[0e+00, -5.712297934223898e-06, -1.18452990136575e-05, -1.509409776190296e-05, -1.651529964874499e-05, -1.708614945528097e-05, -1.731160773488227e-05, -1.738921309879515e-05, -1.741408777888864e-05, -1.742503263812978e-05, -1.7430893421988e-05, -1.743352549965493e-05, -1.743523716868367e-05, -1.743599023029674e-05, -1.743567736411933e-05, -1.743544453347567e-05, -1.743520988384262e-05, -1.743497705319896e-05, -1.743474240356591e-05, -1.743450957292225e-05, -1.74343313119607e-05, -1.743431312206667e-05, -1.743429493217263e-05, -1.7434278561268e-05, -1.743426037137397e-05, -1.743424218147993e-05, -1.74342239915859e-05, -1.743420580169186e-05, -1.743418761179782e-05, -1.743417124089319e-05, -1.743415305099916e-05, -1.743413486110512e-05, -1.743412940413691e-05, -1.743412940413691e-05, -1.743412758514751e-05, -1.743412758514751e-05, -1.74341257661581e-05, -1.74341257661581e-05, -1.74341257661581e-05, -1.74341239471687e-05, -1.74341239471687e-05, -1.74341239471687e-05, -1.74341221281793e-05, -1.74341221281793e-05, -1.743412030918989e-05, -1.743412030918989e-05, -1.743412030918989e-05, -1.743411849020049e-05, -1.743411849020049e-05, -1.743411667121109e-05, -1.743411667121109e-05, -1.743411667121109e-05, -1.743411485222168e-05, -1.743411485222168e-05, -1.743411485222168e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05, -1.743411303323228e-05]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_PrescribedOutlet.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_PrescribedOutlet.txt
deleted file mode 100644
index 8acacd94..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_PrescribedOutlet.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-last-generated=2017-05-03
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "6",
- "linear": " "
-}
-heaHigPow.sta_b.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.063382873535156e+02, 3.250747985839844e+02, 3.307175903320312e+02, 3.324173278808594e+02, 3.329291687011719e+02, 3.330830078125e+02, 3.331296997070312e+02, 3.331438598632812e+02, 3.331479797363281e+02, 3.33149169921875e+02, 3.331497497558594e+02, 3.3314990234375e+02, 3.331500244140625e+02, 3.331500854492188e+02, 3.331500549316406e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.1666552734375e+02, 2.932447814941405e+02, 2.861906127929688e+02, 2.840658569335938e+02, 2.834261474609375e+02, 2.832332763671875e+02, 2.831751098632812e+02, 2.831575927734375e+02, 2.831524047851562e+02, 2.831507263183594e+02, 2.831501770019531e+02, 2.831500854492188e+02, 2.831500854492188e+02, 2.831500549316406e+02, 2.831500244140625e+02, 2.831500244140625e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaHigPow.sta_a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-time=[0e+00, 1.2e+03]
-cooLimPow.sta_b.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.91526123046875e+02, 2.961943969726562e+02, 2.976032104492188e+02, 2.9802783203125e+02, 2.981557312011719e+02, 2.981941833496094e+02, 2.982058410644531e+02, 2.982093811035156e+02, 2.982104187011719e+02, 2.98210693359375e+02, 2.982108459472656e+02, 2.982108764648438e+02, 2.982109069824219e+02, 2.982109375e+02, 2.982109375e+02, 2.982109375e+02, 2.982109069824219e+02, 2.982109069824219e+02, 2.982109069824219e+02, 2.982109069824219e+02, 2.982109069824219e+02, 2.982109069824219e+02, 2.982109069824219e+02, 2.982109069824219e+02, 2.982109069824219e+02, 3.029860229492188e+02, 3.240646972656251e+02, 3.304134521484374e+02, 3.323257141113281e+02, 3.329014587402344e+02, 3.330750427246094e+02, 3.331274108886719e+02, 3.331431884765625e+02, 3.331478576660156e+02, 3.331493530273438e+02, 3.331498413085938e+02, 3.331499328613281e+02, 3.331499328613281e+02, 3.331499633789062e+02, 3.331499633789062e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-cooLimPow.sta_a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaCooUnl.sta_a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaCooUnl.sta_b.T=[2.931499938964844e+02, 2.896850280761719e+02, 2.886432800292969e+02, 2.883296203613281e+02, 2.88235107421875e+02, 2.882066345214844e+02, 2.881981506347656e+02, 2.881954956054688e+02, 2.881947021484375e+02, 2.881944274902344e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.898127136230469e+02, 2.921181030273438e+02, 2.928138427734375e+02, 2.930235290527344e+02, 2.930867004394531e+02, 2.931056823730469e+02, 2.931114501953125e+02, 2.931131896972656e+02, 2.931137084960938e+02, 2.931138610839844e+02, 2.931139221191406e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.939223937988281e+02, 2.950733032226562e+02, 2.954205017089844e+02, 2.955251159667969e+02, 2.955566101074219e+02, 2.955661010742188e+02, 2.955689697265625e+02, 2.955698547363281e+02, 2.955700988769531e+02, 2.955701904296875e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-steSta.sta_b.T=[2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.931139526367188e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.955702209472656e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaHigPow.Q_flow=[0e+00, 3.519483032226562e+02, 4.579231567382812e+02, 4.8984814453125e+02, 4.994689636230469e+02, 5.023652954101562e+02, 5.032305603027344e+02, 5.034989318847656e+02, 5.035811462402344e+02, 5.036082763671875e+02, 5.03618408203125e+02, 5.036187744140625e+02, 5.03618896484375e+02, 5.036189575195312e+02, 5.036189270019531e+02, 5.036189270019531e+02, 5.036189270019531e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 5.03618896484375e+02, 2.51103564453125e+03, 5.373169921875e+03, 6.23749609375e+03, 6.49806787109375e+03, 6.57654833984375e+03, 6.60014013671875e+03, 6.60730126953125e+03, 6.60947265625e+03, 6.610125e+03, 6.61030126953125e+03, 6.61038330078125e+03, 6.61040185546875e+03, 6.61041796875e+03, 6.61042529296875e+03, 6.61042236328125e+03, 6.6104189453125e+03, 6.61041748046875e+03, 6.61041650390625e+03, 6.610416015625e+03, 6.61041552734375e+03, 6.6104150390625e+03, 6.6104150390625e+03, 6.6104150390625e+03, 6.61041455078125e+03, 6.61041455078125e+03, 3.668706787109375e+03, -4.868601989746274e+02, -1.732976806640618e+03, -2.10781689453125e+03, -2.220626220703125e+03, -2.254634521484375e+03, -2.26489013671875e+03, -2.267980712890625e+03, -2.268894775390625e+03, -2.269188720703125e+03, -2.269285400390625e+03, -2.269303466796875e+03, -2.269304443359375e+03, -2.269308837890625e+03, -2.2693125e+03, -2.269314453125e+03, -2.269316162109375e+03, -1.906226196289062e+03, -1.36159033203125e+03, -8.169542236328125e+02, -2.723180847167969e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-cooLimPow.Q_flow=[0e+00, -3.519483032226562e+02, -4.579231567382812e+02, -4.8984814453125e+02, -4.994689636230469e+02, -5.023652954101562e+02, -5.032305603027344e+02, -5.034989318847656e+02, -5.035811462402344e+02, -5.036082763671875e+02, -5.03618408203125e+02, -5.036187744140625e+02, -5.03618896484375e+02, -5.036189575195312e+02, -5.036189270019531e+02, -5.036189270019531e+02, -5.036189270019531e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -5.03618896484375e+02, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, 3.982611999511719e+02, 3.843573730468765e+03, 4.884910156249995e+03, 5.19889794921875e+03, 5.2934619140625e+03, 5.32197607421875e+03, 5.3305751953125e+03, 5.33316650390625e+03, 5.33393310546875e+03, 5.33417919921875e+03, 5.3342607421875e+03, 5.33427587890625e+03, 5.3342763671875e+03, 5.3342802734375e+03, 5.334283203125e+03, 5.33428515625e+03, 5.3342861328125e+03, 4.48080126953125e+03, 3.200572265625e+03, 1.920343383789062e+03, 6.40114501953125e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-heaCooUnl.Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.67250732421875e+02, -4.048622131347656e+02, -4.764226379394531e+02, -4.979785766601562e+02, -5.044693298339844e+02, -5.064203186035156e+02, -5.070125427246094e+02, -5.071921081542969e+02, -5.072442626953125e+02, -5.072593078613281e+02, -5.072669372558594e+02, -5.072687683105469e+02, -5.072703552246094e+02, -5.072710571289062e+02, -5.072707824707031e+02, -5.072704467773438e+02, -5.07270263671875e+02, -5.072702026367188e+02, -5.072701721191406e+02, -5.072701110839844e+02, -5.072700500488281e+02, -5.072700500488281e+02, -5.0727001953125e+02, -5.0727001953125e+02, -5.0727001953125e+02, -6.745115356445312e+02, -9.12124511718751e+02, -9.836916503906247e+02, -1.005248229980469e+03, -1.011738342285156e+03, -1.013695129394531e+03, -1.014285278320312e+03, -1.014463073730469e+03, -1.014515686035156e+03, -1.014532592773438e+03, -1.014538146972656e+03, -1.014539184570312e+03, -1.014539245605469e+03, -1.014539489746094e+03, -1.014539733886719e+03, -1.014539855957031e+03, -1.014539916992188e+03, -8.522135620117188e+02, -6.087239990234375e+02, -3.652344055175781e+02, -1.217448043823242e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-steSta.Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -8.52213623046875e+02, -6.087239990234375e+02, -3.652344055175781e+02, -1.217447967529297e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-setHeaHigPow.y[2]=[1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03]
-heaHigPow.port_b.Xi_outflow[1]=[9.999999776482582e-03, 1.139767747372389e-02, 1.181853096932173e-02, 1.194531284272671e-02, 1.198351942002773e-02, 1.199502125382423e-02, 1.199845783412457e-02, 1.199952326714993e-02, 1.199985016137362e-02, 1.199995819479227e-02, 1.199999824166298e-02, 1.199999917298555e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.463766023516655e-02, 1.838495768606663e-02, 1.951351575553417e-02, 1.985346712172031e-02, 1.995583064854145e-02, 1.99865996837616e-02, 1.999593898653984e-02, 1.999877206981182e-02, 1.99996791779995e-02, 1.999989524483681e-02, 1.999997347593307e-02, 1.999999023973942e-02, 2.000000327825546e-02, 2.000000886619091e-02, 2.000000700354576e-02, 2.000000327825546e-02, 2.000000141561031e-02, 2.000000141561031e-02, 2.000000141561031e-02, 2.000000141561031e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.505465991795063e-02, 8.028431795537441e-03, 5.912187509238732e-03, 5.27475867420435e-03, 5.082845222204924e-03, 5.024982150644064e-03, 5.007532425224781e-03, 5.002274177968502e-03, 5.000718869268894e-03, 5.000218749046326e-03, 5.000054370611906e-03, 5.000023636966944e-03, 5.000021774321795e-03, 5.000014323741198e-03, 5.000007804483175e-03, 5.000004544854164e-03, 5.000002216547728e-03, 5.000000819563866e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03]
-cooLimPow.port_b.Xi_outflow[1]=[9.999999776482582e-03, 8.60232301056385e-03, 8.181469514966011e-03, 8.054687641561031e-03, 8.016480132937431e-03, 8.00497829914093e-03, 8.001541718840599e-03, 8.000476285815239e-03, 8.000150322914124e-03, 8.000042289495468e-03, 8.00000224262476e-03, 8.00000037997961e-03, 8.00000037997961e-03, 7.999999448657036e-03, 7.999999448657036e-03, 7.999999448657036e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 6.681169848889112e-03, 4.807521123439074e-03, 4.243242088705301e-03, 4.07326640561223e-03, 4.022084176540375e-03, 4.006700124591589e-03, 4.00203000754118e-03, 4.000614397227764e-03, 4.000203218311071e-03, 4.000084474682808e-03, 4.000023938715458e-03, 4.000009503215551e-03, 3.999997396022081e-03, 3.999991808086634e-03, 3.999993670731783e-03, 3.999996464699507e-03, 3.999997861683369e-03, 3.999998327344656e-03, 3.999998793005943e-03, 3.999999258667231e-03, 3.999999724328518e-03, 3.999999724328518e-03, 3.999999724328518e-03, 3.999999724328518e-03, 3.999999724328518e-03, 7.626582868397236e-03, 1.277915015816691e-02, 1.43310623243451e-02, 1.479851081967354e-02, 1.493924669921398e-02, 1.498167961835861e-02, 1.499447599053383e-02, 1.499833259731531e-02, 1.499947253614664e-02, 1.499983947724104e-02, 1.499996054917574e-02, 1.499998290091753e-02, 1.49999838322401e-02, 1.499998942017555e-02, 1.499999407678843e-02, 1.499999687075615e-02, 1.49999987334013e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.500000059604645e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02]
-setCooLimPow.y[2]=[8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02]
-setHeaCooUnl.y[2]=[1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03]
-heaCooUnl.port_b.Xi_outflow[1]=[9.999999776482582e-03, 1.139767747372389e-02, 1.181853096932173e-02, 1.194531284272671e-02, 1.198351942002773e-02, 1.199502125382423e-02, 1.199845783412457e-02, 1.199952326714993e-02, 1.199985016137362e-02, 1.199995819479227e-02, 1.199999824166298e-02, 1.199999917298555e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.068117003887892e-02, 8.807521313428879e-03, 8.243242278695107e-03, 8.073266595602036e-03, 8.022083900868893e-03, 8.006700314581394e-03, 8.002030663192272e-03, 8.000614121556282e-03, 8.000203408300877e-03, 8.000084199011326e-03, 8.00002459436655e-03, 8.000009693205357e-03, 7.999997586011887e-03, 7.999991998076439e-03, 7.999993860721588e-03, 7.999996654689312e-03, 7.999997586011887e-03, 7.999998517334461e-03, 7.999998517334461e-03, 7.999999448657036e-03, 7.999999448657036e-03, 7.999999448657036e-03, 7.999999448657036e-03, 7.999999448657036e-03, 7.999999448657036e-03, 7.010932080447674e-03, 5.605686455965036e-03, 5.182437598705294e-03, 5.054951645433903e-03, 5.016569048166275e-03, 5.004996433854103e-03, 5.001506302505732e-03, 5.000454839318991e-03, 5.000143777579069e-03, 5.000043660402298e-03, 5.000011064112186e-03, 5.000004544854164e-03, 5.000004544854164e-03, 5.000002682209015e-03, 5.00000175088644e-03, 5.000000819563866e-03, 5.000000353902578e-03, 5.000000353902578e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03]
-steSta.port_b.Xi_outflow[1]=[1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03]
-heaHigPow.mWat_flow=[0e+00, 1.397677115164697e-04, 1.818530581658706e-04, 1.945312833413482e-04, 1.983519468922168e-04, 1.995021593756974e-04, 1.998457883019e-04, 1.999523519771174e-04, 1.999850064748898e-04, 1.999957748921588e-04, 1.999998057726771e-04, 1.999999512918293e-04, 1.99999994947575e-04, 2.000000240514055e-04, 2.000000094994903e-04, 2.000000094994903e-04, 2.000000094994903e-04, 2.000000094994903e-04, 2.000000094994903e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 4.637660167645663e-04, 8.384957909584045e-04, 9.51351597905159e-04, 9.853467345237732e-04, 9.955831337720156e-04, 9.986599907279015e-04, 9.99593990854919e-04, 9.998771129176021e-04, 9.999680332839489e-04, 9.999894537031651e-04, 9.999973699450493e-04, 9.999989997595549e-04, 1.000000280328095e-03, 1.000000862404704e-03, 1.00000062957406e-03, 1.000000396743417e-03, 1.000000163912773e-03, 1.000000163912773e-03, 1.000000163912773e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 5.054659559391439e-04, -1.971567835425989e-04, -4.087812558282155e-04, -4.725241451524198e-04, -4.917155019938946e-04, -4.975017509423196e-04, -4.992467584088445e-04, -4.997725482098758e-04, -4.999280790798366e-04, -4.999781376682222e-04, -4.999945522285998e-04, -4.999976372346282e-04, -4.999978118576109e-04, -4.999985685572028e-04, -4.999992088414729e-04, -4.999995580874383e-04, -4.99999790918082e-04, -4.199999384582043e-04, -2.999999851454049e-04, -1.800000027287751e-04, -6.000000212225132e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-cooLimPow.mWat_flow=[0e+00, -1.397677115164697e-04, -1.818530581658706e-04, -1.945312833413482e-04, -1.983519468922168e-04, -1.995021593756974e-04, -1.998457883019e-04, -1.999523519771174e-04, -1.999850064748898e-04, -1.999957748921588e-04, -1.999998057726771e-04, -1.999999512918293e-04, -1.99999994947575e-04, -2.000000240514055e-04, -2.000000094994903e-04, -2.000000094994903e-04, -2.000000094994903e-04, -2.000000094994903e-04, -2.000000094994903e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -3.318829985801131e-04, -5.192479002289474e-04, -5.756758037023246e-04, -5.926733720116317e-04, -5.977915716357529e-04, -5.993300001136959e-04, -5.997970001772046e-04, -5.999385612085462e-04, -5.99979714024812e-04, -5.999915883876383e-04, -5.999975837767124e-04, -5.999990389682353e-04, -6.000002613291144e-04, -6.000008434057236e-04, -6.000006105750799e-04, -6.000003777444363e-04, -6.000002031214535e-04, -6.000001449137926e-04, -6.000001449137926e-04, -6.000000867061317e-04, -6.000000284984708e-04, -6.000000284984708e-04, -6.000000284984708e-04, -6.000000284984708e-04, -6.000000284984708e-04, -2.373417082708329e-04, 2.779149799607716e-04, 4.331062664277843e-04, 4.798510344699025e-04, 4.939247155562043e-04, 4.981679376214743e-04, 4.994476330466568e-04, 4.998332005925477e-04, 4.999472876079381e-04, 4.999839584343135e-04, 4.999960074201226e-04, 4.999982775188982e-04, 4.999983939342201e-04, 4.999989760108292e-04, 4.999994416721165e-04, 4.999996745027602e-04, 4.999998491257429e-04, 4.199999675620347e-04, 2.999999851454049e-04, 1.800000027287751e-04, 6.000000212225132e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-heaCooUnl.mWat_flow=[0e+00, 1.397677115164697e-04, 1.818530581658706e-04, 1.945312833413482e-04, 1.983519468922168e-04, 1.995021593756974e-04, 1.998457883019e-04, 1.999523519771174e-04, 1.999850064748898e-04, 1.999957748921588e-04, 1.999998057726771e-04, 1.999999512918293e-04, 1.99999994947575e-04, 2.000000240514055e-04, 2.000000094994903e-04, 2.000000094994903e-04, 2.000000094994903e-04, 2.000000094994903e-04, 2.000000094994903e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 6.811699859099463e-05, -1.192479030578397e-04, -1.756757847033441e-04, -1.926733821164817e-04, -1.977915671886876e-04, -1.993300102185458e-04, -1.997969811782241e-04, -1.999385713133961e-04, -1.999796950258315e-04, -1.999915693886578e-04, -1.999975793296471e-04, -1.9999903452117e-04, -2.000002714339644e-04, -2.000008389586583e-04, -2.000006352318451e-04, -2.000003587454557e-04, -2.000002132263035e-04, -2.000001695705578e-04, -2.000001259148121e-04, -2.000000822590664e-04, -2.000000386033207e-04, -2.000000240514055e-04, -2.000000240514055e-04, -2.000000240514055e-04, -2.000000094994903e-04, -2.989068161696196e-04, -4.394313727971172e-04, -4.817562585230915e-04, -4.945048131048679e-04, -4.983430844731629e-04, -4.995003691874444e-04, -4.998493241146207e-04, -4.999545053578913e-04, -4.9998564645648e-04, -4.999955999664962e-04, -4.999989178031683e-04, -4.999995580874383e-04, -4.999995580874383e-04, -4.999997327104211e-04, -4.999998491257429e-04, -4.999999073334038e-04, -4.999999655410647e-04, -4.199999966658652e-04, -2.999999851454049e-04, -1.800000027287751e-04, -6.000000212225132e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-steSta.mWat_flow=[1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -4.199999966658652e-04, -3.000000142492354e-04, -1.800000027287751e-04, -5.999999848427251e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_PrescribedOutlet_TSetOnly.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_PrescribedOutlet_TSetOnly.txt
deleted file mode 100644
index 49c3b2db..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_PrescribedOutlet_TSetOnly.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-last-generated=2017-05-03
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "3",
- "linear": " "
-}
-heaHigPow.sta_b.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.063377685546875e+02, 3.250743103027344e+02, 3.307173461914062e+02, 3.324172058105469e+02, 3.329292297363281e+02, 3.330835876464844e+02, 3.331303100585938e+02, 3.331441345214844e+02, 3.331481323242188e+02, 3.331492309570312e+02, 3.331497192382812e+02, 3.331499328613281e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.166663513183594e+02, 2.932446899414061e+02, 2.861906738281251e+02, 2.840658874511719e+02, 2.834258728027344e+02, 2.832333374023438e+02, 2.831752624511719e+02, 2.831576538085938e+02, 2.831523132324219e+02, 2.831507873535156e+02, 2.831502380371094e+02, 2.831500549316406e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaHigPow.sta_a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-time=[0e+00, 1.2e+03]
-cooLimPow.sta_b.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.915015258789062e+02, 2.891594543457031e+02, 2.884540710449219e+02, 2.882416076660156e+02, 2.881775817871094e+02, 2.881582946777344e+02, 2.881524658203125e+02, 2.881507263183594e+02, 2.881502380371094e+02, 2.881500854492188e+02, 2.881500244140625e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 3.029852905273438e+02, 3.240647888183595e+02, 3.304133911132812e+02, 3.3232568359375e+02, 3.329017028808594e+02, 3.330750122070312e+02, 3.331272888183594e+02, 3.331430969238281e+02, 3.331479187011719e+02, 3.331492919921875e+02, 3.331497802734375e+02, 3.331499328613281e+02, 3.331499938964844e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-cooLimPow.sta_a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaCooUnl.sta_a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaCooUnl.sta_b.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.915015258789062e+02, 2.891594543457031e+02, 2.884540710449219e+02, 2.882416076660156e+02, 2.881775817871094e+02, 2.881582946777344e+02, 2.881524658203125e+02, 2.881507263183594e+02, 2.881502380371094e+02, 2.881500854492188e+02, 2.881500244140625e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.865016479492188e+02, 2.841594543457031e+02, 2.834540710449219e+02, 2.832415771484375e+02, 2.831775817871094e+02, 2.831583251953125e+02, 2.831525268554688e+02, 2.831507568359375e+02, 2.831502380371094e+02, 2.831500854492188e+02, 2.831500244140625e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-steSta.sta_b.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaHigPow.Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.337951538085938e+03, 3.23885009765625e+03, 3.811357421875e+03, 3.983815673828125e+03, 4.035762939453125e+03, 4.051423828125e+03, 4.056162841796875e+03, 4.057564453125e+03, 4.057970458984375e+03, 4.05808056640625e+03, 4.05813232421875e+03, 4.05815380859375e+03, 4.05816162109375e+03, 4.058163818359375e+03, 4.058163330078125e+03, 4.058163330078125e+03, 4.05816259765625e+03, 4.058162353515625e+03, 4.058161865234375e+03, 4.058161376953125e+03, 4.058160888671875e+03, 4.05816064453125e+03, 4.058160400390625e+03, 4.05816015625e+03, 4.05816015625e+03, 2.385826904296875e+03, 9.606456756581446e+00, -7.060520629882773e+02, -9.216188354492188e+02, -9.8655126953125e+02, -1.006085571289062e+03, -1.011978271484375e+03, -1.013762634277344e+03, -1.014304809570312e+03, -1.014460510253906e+03, -1.0145146484375e+03, -1.014533508300781e+03, -1.0145400390625e+03, -1.014541625976562e+03, -1.014541137695312e+03, -1.014540649414062e+03, -1.014540283203125e+03, -8.522136840820312e+02, -6.087239990234375e+02, -3.652344055175781e+02, -1.217447967529297e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-cooLimPow.Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.672439422607422e+02, -4.048562622070312e+02, -4.76419677734375e+02, -4.979769592285156e+02, -5.044703674316406e+02, -5.06427978515625e+02, -5.070203552246094e+02, -5.07195556640625e+02, -5.072463073730469e+02, -5.072600708007812e+02, -5.072665405273438e+02, -5.072692260742188e+02, -5.072702026367188e+02, -5.072704772949219e+02, -5.072704162597656e+02, -5.072704162597656e+02, -5.072703247070312e+02, -5.072702941894531e+02, -5.072702331542969e+02, -5.072701721191406e+02, -5.072701110839844e+02, -5.072700805664062e+02, -5.072700500488281e+02, -5.0727001953125e+02, -5.0727001953125e+02, 9.97829833984375e+02, 3.136428222656259e+03, 3.780520751953121e+03, 3.974531005859375e+03, 4.03297021484375e+03, 4.050551025390625e+03, 4.0558544921875e+03, 4.05746044921875e+03, 4.0579482421875e+03, 4.05808837890625e+03, 4.05813720703125e+03, 4.058154052734375e+03, 4.05816015625e+03, 4.058161376953125e+03, 4.0581611328125e+03, 4.05816064453125e+03, 4.05816015625e+03, 3.4088544921875e+03, 2.43489599609375e+03, 1.460937622070312e+03, 4.869791870117188e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-heaCooUnl.Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.672439422607422e+02, -4.048562622070312e+02, -4.76419677734375e+02, -4.979769592285156e+02, -5.044703674316406e+02, -5.06427978515625e+02, -5.070203552246094e+02, -5.07195556640625e+02, -5.072463073730469e+02, -5.072600708007812e+02, -5.072665405273438e+02, -5.072692260742188e+02, -5.072702026367188e+02, -5.072704772949219e+02, -5.072704162597656e+02, -5.072704162597656e+02, -5.072703247070312e+02, -5.072702941894531e+02, -5.072702331542969e+02, -5.072701721191406e+02, -5.072701110839844e+02, -5.072700805664062e+02, -5.072700500488281e+02, -5.0727001953125e+02, -5.0727001953125e+02, -6.745032958984375e+02, -9.121253662109385e+02, -9.836912231445309e+02, -1.005247863769531e+03, -1.011741149902344e+03, -1.013694580078125e+03, -1.014283813476562e+03, -1.014462280273438e+03, -1.014516479492188e+03, -1.014532043457031e+03, -1.014537475585938e+03, -1.014539367675781e+03, -1.014539978027344e+03, -1.014540161132812e+03, -1.014540100097656e+03, -1.0145400390625e+03, -1.0145400390625e+03, -8.52213623046875e+02, -6.087239990234375e+02, -3.652344055175781e+02, -1.217447967529297e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-steSta.Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -5.072699890136719e+02, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -1.014539978027344e+03, -8.52213623046875e+02, -6.087239990234375e+02, -3.652344055175781e+02, -1.217447967529297e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-setHeaHigPow.y[2]=[1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03]
-heaHigPow.port_b.Xi_outflow[1]=[9.999999776482582e-03, 9.999999776482582e-03]
-cooLimPow.port_b.Xi_outflow[1]=[9.999999776482582e-03, 9.999999776482582e-03]
-setCooLimPow.y[2]=[8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02]
-setHeaCooUnl.y[2]=[1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03]
-heaCooUnl.port_b.Xi_outflow[1]=[9.999999776482582e-03, 9.999999776482582e-03]
-steSta.port_b.Xi_outflow[1]=[9.999999776482582e-03, 9.999999776482582e-03]
-heaHigPow.mWat_flow=[0e+00, 0e+00]
-cooLimPow.mWat_flow=[0e+00, 0e+00]
-heaCooUnl.mWat_flow=[0e+00, 0e+00]
-steSta.mWat_flow=[0e+00, 0e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_PrescribedOutlet_Water.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_PrescribedOutlet_Water.txt
deleted file mode 100644
index 40be98fd..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_PrescribedOutlet_Water.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-last-generated=2017-05-03
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "3",
- "linear": " "
-}
-heaHigPow.sta_b.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.063377685546875e+02, 3.250743103027344e+02, 3.307173461914062e+02, 3.324172058105469e+02, 3.329292297363281e+02, 3.330835876464844e+02, 3.331303100585938e+02, 3.331441345214844e+02, 3.331481323242188e+02, 3.331492309570312e+02, 3.331497192382812e+02, 3.331499328613281e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.166663513183594e+02, 2.932446899414061e+02, 2.861906738281251e+02, 2.840658874511719e+02, 2.834258728027344e+02, 2.832333374023438e+02, 2.831752624511719e+02, 2.831576538085938e+02, 2.831523132324219e+02, 2.831507873535156e+02, 2.831502380371094e+02, 2.831500549316406e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaHigPow.sta_a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-time=[0e+00, 1.2e+03]
-cooLimPow.sta_b.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.915015258789062e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 2.907599487304688e+02, 3.029852905273438e+02, 3.240647888183595e+02, 3.304133911132812e+02, 3.3232568359375e+02, 3.329017028808594e+02, 3.330750122070312e+02, 3.331272888183594e+02, 3.331430969238281e+02, 3.331479187011719e+02, 3.331492919921875e+02, 3.331497802734375e+02, 3.331499328613281e+02, 3.331499938964844e+02, 3.331500244140625e+02, 3.331500244140625e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-cooLimPow.sta_a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaCooUnl.sta_a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaCooUnl.sta_b.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.915015258789062e+02, 2.891594543457031e+02, 2.884540710449219e+02, 2.882416076660156e+02, 2.881775817871094e+02, 2.881582946777344e+02, 2.881524658203125e+02, 2.881507263183594e+02, 2.881502380371094e+02, 2.881500854492188e+02, 2.881500244140625e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.865016479492188e+02, 2.841594543457031e+02, 2.834540710449219e+02, 2.832415771484375e+02, 2.831775817871094e+02, 2.831583251953125e+02, 2.831525268554688e+02, 2.831507568359375e+02, 2.831502380371094e+02, 2.831500854492188e+02, 2.831500244140625e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-steSta.sta_b.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaHigPow.Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.5177607421875e+03, 1.33571357421875e+04, 1.5718177734375e+04, 1.6429400390625e+04, 1.66436328125e+04, 1.670821875e+04, 1.6727763671875e+04, 1.6733544921875e+04, 1.673521875e+04, 1.6735671875e+04, 1.6735884765625e+04, 1.6735974609375e+04, 1.6736005859375e+04, 1.6736015625e+04, 1.6736013671875e+04, 1.6736013671875e+04, 1.673601171875e+04, 1.6736009765625e+04, 1.67360078125e+04, 1.6736005859375e+04, 1.673600390625e+04, 1.6736001953125e+04, 1.6736001953125e+04, 1.6736e+04, 1.6736e+04, 9.8392373046875e+03, 3.96173782348206e+01, -2.911784423828109e+03, -3.80078955078125e+03, -4.068573486328125e+03, -4.1491337890625e+03, -4.17343505859375e+03, -4.1807939453125e+03, -4.1830302734375e+03, -4.18367236328125e+03, -4.1838955078125e+03, -4.18397314453125e+03, -4.184e+03, -4.1840068359375e+03, -4.1840048828125e+03, -4.1840029296875e+03, -4.1840009765625e+03, -3.514560302734375e+03, -2.510400146484375e+03, -1.506239990234375e+03, -5.020799865722656e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-cooLimPow.Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -6.897200927734375e+02, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, -1e+03, 4.11508642578125e+03, 1.293474414062504e+04, 1.559100585937499e+04, 1.6391111328125e+04, 1.6632115234375e+04, 1.670462109375e+04, 1.67264921875e+04, 1.6733115234375e+04, 1.6735126953125e+04, 1.6735705078125e+04, 1.673590625e+04, 1.67359765625e+04, 1.6736e+04, 1.6736005859375e+04, 1.673600390625e+04, 1.6736001953125e+04, 1.6736001953125e+04, 1.4058240234375e+04, 1.0041599609375e+04, 6.0249599609375e+03, 2.008319946289062e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-heaCooUnl.Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -6.897200927734375e+02, -1.669641967773438e+03, -1.964772216796875e+03, -2.053675048828125e+03, -2.0804541015625e+03, -2.08852734375e+03, -2.090970458984375e+03, -2.091693115234375e+03, -2.09190234375e+03, -2.091958984375e+03, -2.091985595703125e+03, -2.091996826171875e+03, -2.092000732421875e+03, -2.092001953125e+03, -2.092001708984375e+03, -2.092001708984375e+03, -2.09200146484375e+03, -2.092001220703125e+03, -2.0920009765625e+03, -2.092000732421875e+03, -2.09200048828125e+03, -2.092000244140625e+03, -2.092000244140625e+03, -2.092e+03, -2.092e+03, -2.78167626953125e+03, -3.761638183593754e+03, -4.056778320312498e+03, -4.14567919921875e+03, -4.17245751953125e+03, -4.18051318359375e+03, -4.182943359375e+03, -4.18367919921875e+03, -4.18390283203125e+03, -4.18396728515625e+03, -4.18398974609375e+03, -4.18399755859375e+03, -4.184e+03, -4.18400048828125e+03, -4.18400048828125e+03, -4.18400048828125e+03, -4.184e+03, -3.51456005859375e+03, -2.51039990234375e+03, -1.506239990234375e+03, -5.020799865722656e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-steSta.Q_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -2.092e+03, -4.184e+03, -4.184e+03, -4.184e+03, -4.184e+03, -4.184e+03, -4.184e+03, -4.184e+03, -4.184e+03, -4.184e+03, -4.184e+03, -4.184e+03, -4.184e+03, -4.184e+03, -4.184e+03, -4.184e+03, -4.184e+03, -4.184e+03, -3.51456005859375e+03, -2.51039990234375e+03, -1.506239990234375e+03, -5.020799865722656e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-heaHigPow.mWat_flow=[0e+00, 0e+00]
-cooLimPow.mWat_flow=[0e+00, 0e+00]
-heaCooUnl.mWat_flow=[0e+00, 0e+00]
-steSta.mWat_flow=[0e+00, 0e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_PrescribedOutlet_X_wSetOnly.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_PrescribedOutlet_X_wSetOnly.txt
deleted file mode 100644
index d5f5ae8e..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_PrescribedOutlet_X_wSetOnly.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-last-generated=2017-05-03
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "3",
- "linear": " "
-}
-heaHigPow.sta_b.T=[2.931499938964844e+02, 2.896849365234375e+02, 2.886429748535156e+02, 2.883294982910156e+02, 2.882352294921875e+02, 2.882066955566406e+02, 2.881980590820312e+02, 2.881955261230469e+02, 2.881947021484375e+02, 2.881944274902344e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.816846923828125e+02, 2.724846801757812e+02, 2.697254943847656e+02, 2.688951416015625e+02, 2.6864501953125e+02, 2.685701904296875e+02, 2.685470886230469e+02, 2.685404663085938e+02, 2.685378723144531e+02, 2.685372619628906e+02, 2.685372009277344e+02, 2.685372009277344e+02, 2.685371704101562e+02, 2.685371398925781e+02, 2.685371398925781e+02, 2.685371398925781e+02, 2.685371398925781e+02, 2.68537109375e+02, 2.68537109375e+02, 2.68537109375e+02, 2.68537109375e+02, 2.68537109375e+02, 2.68537109375e+02, 2.68537109375e+02, 2.68537109375e+02, 2.806576843261719e+02, 2.980517578125001e+02, 3.033308410644531e+02, 3.049248046875e+02, 3.054049377441406e+02, 3.055495300292969e+02, 3.055933837890625e+02, 3.05606689453125e+02, 3.05610595703125e+02, 3.056118774414062e+02, 3.056123046875e+02, 3.056124572753906e+02, 3.056125183105469e+02, 3.056125183105469e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaHigPow.sta_a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-time=[0e+00, 1.2e+03]
-cooLimPow.sta_b.T=[2.931499938964844e+02, 2.966232299804688e+02, 2.976708374023438e+02, 2.97986328125e+02, 2.980812072753906e+02, 2.981099243164062e+02, 2.981186218261719e+02, 2.981211853027344e+02, 2.981220092773438e+02, 2.981222839355469e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 3.014100952148438e+02, 3.060941772460938e+02, 3.075076293945312e+02, 3.079337768554688e+02, 3.080622253417969e+02, 3.081006469726562e+02, 3.081125183105469e+02, 3.081159057617188e+02, 3.081171264648438e+02, 3.081175231933594e+02, 3.081175537109375e+02, 3.081175537109375e+02, 3.081175842285156e+02, 3.081176147460938e+02, 3.081176147460938e+02, 3.081176147460938e+02, 3.081176147460938e+02, 3.081176147460938e+02, 3.081176147460938e+02, 3.081176452636719e+02, 3.081176452636719e+02, 3.081176452636719e+02, 3.081176452636719e+02, 3.081176452636719e+02, 3.081176452636719e+02, 2.990524597167969e+02, 2.862680969238281e+02, 2.82439453125e+02, 2.812880554199219e+02, 2.80941650390625e+02, 2.808373718261719e+02, 2.808057556152344e+02, 2.80796142578125e+02, 2.807933349609375e+02, 2.807924194335938e+02, 2.807921142578125e+02, 2.807919921875e+02, 2.807919616699219e+02, 2.807919616699219e+02, 2.807919616699219e+02, 2.807919616699219e+02, 2.807919921875e+02, 2.807919921875e+02, 2.807919921875e+02, 2.807919921875e+02, 2.807919921875e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-cooLimPow.sta_a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaCooUnl.sta_a.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaCooUnl.sta_b.T=[2.931499938964844e+02, 2.896849365234375e+02, 2.886429748535156e+02, 2.883294982910156e+02, 2.882352294921875e+02, 2.882066955566406e+02, 2.881980590820312e+02, 2.881955261230469e+02, 2.881947021484375e+02, 2.881944274902344e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.914599914550781e+02, 2.96112548828125e+02, 2.975164794921875e+02, 2.979397583007812e+02, 2.980673522949219e+02, 2.981055297851562e+02, 2.981172790527344e+02, 2.981206665039062e+02, 2.981218872070312e+02, 2.981222534179688e+02, 2.98122314453125e+02, 2.98122314453125e+02, 2.981223449707031e+02, 2.981223449707031e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 3.00587646484375e+02, 3.040972290039062e+02, 3.051558837890625e+02, 3.054749145507812e+02, 3.055709838867188e+02, 3.055998840332031e+02, 3.056086730957031e+02, 3.05611328125e+02, 3.056120910644531e+02, 3.056123657226562e+02, 3.056124572753906e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-steSta.sta_b.T=[2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.881943359375e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 2.981223754882812e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 3.056124877929688e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-heaHigPow.Q_flow=[0e+00, 0e+00]
-cooLimPow.Q_flow=[0e+00, 0e+00]
-heaCooUnl.Q_flow=[0e+00, 0e+00]
-steSta.Q_flow=[0e+00, 0e+00]
-setHeaHigPow.y[2]=[1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03]
-heaHigPow.port_b.Xi_outflow[1]=[9.999999776482582e-03, 1.139771565794945e-02, 1.18186604231596e-02, 1.194536034017801e-02, 1.198347099125385e-02, 1.199500169605017e-02, 1.19984894990921e-02, 1.199951861053705e-02, 1.199984829872847e-02, 1.199996098875999e-02, 1.199999917298555e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.463739853352308e-02, 1.838481798768044e-02, 1.951331272721291e-02, 1.985333114862442e-02, 1.995579339563847e-02, 1.998645626008511e-02, 1.99959110468626e-02, 1.999862864613533e-02, 1.999969035387039e-02, 1.999994739890099e-02, 1.999997161328793e-02, 1.999997161328793e-02, 1.999998278915882e-02, 1.999999023973942e-02, 1.999999396502972e-02, 1.999999769032001e-02, 1.999999769032001e-02, 1.999999769032001e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.505456957966089e-02, 8.028363808989494e-03, 5.912256427109254e-03, 5.274805705994368e-03, 5.082923918962479e-03, 5.025154910981655e-03, 5.007630679756403e-03, 5.002312827855349e-03, 5.00075239688158e-03, 5.000246688723564e-03, 5.000073462724686e-03, 5.000013392418623e-03, 4.999989178031683e-03, 4.999990575015545e-03, 4.999993834644556e-03, 4.999997094273567e-03, 4.999998491257429e-03, 4.999999422580004e-03, 4.999999888241291e-03, 4.999999888241291e-03, 5.000000353902578e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03]
-cooLimPow.port_b.Xi_outflow[1]=[9.999999776482582e-03, 8.602283895015717e-03, 8.181340061128139e-03, 8.054640144109726e-03, 8.016529493033886e-03, 8.004997856914997e-03, 8.001510053873062e-03, 8.000480942428112e-03, 8.000152185559273e-03, 8.000039495527744e-03, 8.000001311302185e-03, 8.00000037997961e-03, 8.00000037997961e-03, 7.999999448657036e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 6.681300699710846e-03, 4.80759097263217e-03, 4.243343602865934e-03, 4.073334392160177e-03, 4.022103268653154e-03, 4.006772302091122e-03, 4.002044443041086e-03, 4.00068610906601e-03, 4.000198561698198e-03, 4.000046756118536e-03, 4.000025801360607e-03, 4.000026267021894e-03, 4.000016488134861e-03, 4.000009503215551e-03, 4.000005312263966e-03, 4.000002983957529e-03, 4.000002518296242e-03, 4.000001586973667e-03, 4.00000112131238e-03, 4.000000655651093e-03, 4.000000655651093e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 7.626648526638746e-03, 1.277920044958594e-02, 1.433101203292607e-02, 1.479847636073828e-02, 1.493918895721436e-02, 1.498155295848846e-02, 1.499440427869558e-02, 1.49983037263155e-02, 1.49994483217597e-02, 1.49998189881444e-02, 1.499994564801455e-02, 1.499999035149813e-02, 1.500000804662704e-02, 1.500000711530447e-02, 1.500000432133675e-02, 1.50000024586916e-02, 1.500000152736902e-02, 1.500000059604645e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02]
-setCooLimPow.y[2]=[8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 4.000000189989805e-03, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02]
-setHeaCooUnl.y[2]=[1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03]
-heaCooUnl.port_b.Xi_outflow[1]=[9.999999776482582e-03, 1.139771565794945e-02, 1.18186604231596e-02, 1.194536034017801e-02, 1.198347099125385e-02, 1.199500169605017e-02, 1.19984894990921e-02, 1.199951861053705e-02, 1.199984829872847e-02, 1.199996098875999e-02, 1.199999917298555e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.068130042403936e-02, 8.807591162621975e-03, 8.24334379285574e-03, 8.073334582149982e-03, 8.02210345864296e-03, 8.00677202641964e-03, 8.002044633030891e-03, 8.000685833394527e-03, 8.000198751688004e-03, 8.000046946108341e-03, 8.000025525689125e-03, 8.0000264570117e-03, 8.000016212463379e-03, 8.000009693205357e-03, 8.000005036592484e-03, 8.000003173947334e-03, 8.00000224262476e-03, 8.000001311302185e-03, 8.000001311302185e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 7.010913919657469e-03, 5.605672951787704e-03, 5.182451102882626e-03, 5.054960958659649e-03, 5.016584880650043e-03, 5.005030892789364e-03, 5.001526325941086e-03, 5.000462755560875e-03, 5.000150296837091e-03, 5.000049248337746e-03, 5.000014789402485e-03, 5.000002682209015e-03, 4.999998025596142e-03, 4.999998025596142e-03, 4.999998956918716e-03, 4.999999422580004e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03]
-steSta.port_b.Xi_outflow[1]=[1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 1.200000010430813e-02, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 8.00000037997961e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03]
-heaHigPow.mWat_flow=[0e+00, 1.397715968778357e-04, 1.818660093704239e-04, 1.945359981618822e-04, 1.983470720006153e-04, 1.995001948671415e-04, 1.998489897232503e-04, 1.999518717639148e-04, 1.999848027480766e-04, 1.999960804823786e-04, 1.999998785322532e-04, 1.999999658437446e-04, 1.99999994947575e-04, 2.000000094994903e-04, 2.000000094994903e-04, 2.000000094994903e-04, 2.000000094994903e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 4.637398524209857e-04, 8.384817629121244e-04, 9.513312834315002e-04, 9.853331139311194e-04, 9.955792920663953e-04, 9.986455552279949e-04, 9.995910804718733e-04, 9.998627938330173e-04, 9.999689646065235e-04, 9.999946923926473e-04, 9.999972535297275e-04, 9.999971371144056e-04, 9.999983012676239e-04, 9.999989997595549e-04, 9.999994654208422e-04, 9.999996982514858e-04, 9.999998146668077e-04, 9.999998146668077e-04, 9.999999310821295e-04, 9.999999310821295e-04, 9.999999310821295e-04, 9.999999310821295e-04, 9.999999310821295e-04, 9.999999310821295e-04, 1.000000047497451e-03, 5.054569919593632e-04, -1.971636374946714e-04, -4.087743873242277e-04, -4.725194303318858e-04, -4.917076439596713e-04, -4.974845214746892e-04, -4.992369213141501e-04, -4.997687065042555e-04, -4.999247612431645e-04, -4.999753437004983e-04, -4.999926313757896e-04, -4.999986849725246e-04, -5.000010714866221e-04, -5.000008968636394e-04, -5.000006058253348e-04, -5.000003147870302e-04, -5.000001401640475e-04, -4.200000257696956e-04, -3.000000142492354e-04, -1.800000027287751e-04, -5.999999848427251e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-cooLimPow.mWat_flow=[0e+00, -1.397715968778357e-04, -1.818660093704239e-04, -1.945359981618822e-04, -1.983470720006153e-04, -1.995001948671415e-04, -1.998489897232503e-04, -1.999518717639148e-04, -1.999848027480766e-04, -1.999960804823786e-04, -1.999998785322532e-04, -1.999999658437446e-04, -1.99999994947575e-04, -2.000000094994903e-04, -2.000000094994903e-04, -2.000000094994903e-04, -2.000000094994903e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -3.31869930960238e-04, -5.192409153096378e-04, -5.756656755693257e-04, -5.926665617153049e-04, -5.977896507829428e-04, -5.993227823637426e-04, -5.997955449856818e-04, -5.999314016662538e-04, -5.999801796860993e-04, -5.999953136779368e-04, -5.999974091537297e-04, -5.999974091537297e-04, -5.999983404763043e-04, -5.999990971758962e-04, -5.999995046295226e-04, -5.999996792525053e-04, -5.999997374601662e-04, -5.99999853875488e-04, -5.99999912083149e-04, -5.999999702908099e-04, -5.999999702908099e-04, -5.999999702908099e-04, -5.999999702908099e-04, -5.999999702908099e-04, -5.999999702908099e-04, -2.373351308051497e-04, 2.779199858196102e-04, 4.331012023612848e-04, 4.798476002179086e-04, 4.939189529977739e-04, 4.98155306559056e-04, 4.994404152967036e-04, 4.998304066248238e-04, 4.999448428861797e-04, 4.999819211661816e-04, 4.999946104362607e-04, 4.999990342184901e-04, 5.000007804483175e-04, 5.000006640329957e-04, 5.00000431202352e-04, 5.000001983717084e-04, 5.000000819563866e-04, 4.200000257696956e-04, 3.000000142492354e-04, 1.800000027287751e-04, 5.999999848427251e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-heaCooUnl.mWat_flow=[0e+00, 1.397715968778357e-04, 1.818660093704239e-04, 1.945359981618822e-04, 1.983470720006153e-04, 1.995001948671415e-04, 1.998489897232503e-04, 1.999518717639148e-04, 1.999848027480766e-04, 1.999960804823786e-04, 1.999998785322532e-04, 1.999999658437446e-04, 1.99999994947575e-04, 2.000000094994903e-04, 2.000000094994903e-04, 2.000000094994903e-04, 2.000000094994903e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 6.81300662108697e-05, -1.192408963106573e-04, -1.756656565703452e-04, -1.926665572682396e-04, -1.977896608877927e-04, -1.993227779166773e-04, -1.997955550905317e-04, -1.999313826672733e-04, -1.999801606871188e-04, -1.999953237827867e-04, -1.999974338104948e-04, -1.999973756028339e-04, -1.999983651330695e-04, -1.999990636250004e-04, -1.99999485630542e-04, -1.999996893573552e-04, -1.999997621169314e-04, -1.999998348765075e-04, -1.999999076360837e-04, -1.999999512918293e-04, -1.999999512918293e-04, -1.999999658437446e-04, -1.999999803956598e-04, -1.999999803956598e-04, -1.99999994947575e-04, -2.989085915032774e-04, -4.394327406771487e-04, -4.817548615392295e-04, -4.945038817822933e-04, -4.983415128663182e-04, -4.994969349354506e-04, -4.998474032618105e-04, -4.999537486582994e-04, -4.999849479645491e-04, -4.99995076097548e-04, -4.999985103495419e-04, -4.999997327104211e-04, -5.000001983717084e-04, -5.000001983717084e-04, -5.000001401640475e-04, -5.000000819563866e-04, -5.000000237487257e-04, -4.199999966658652e-04, -3.000000142492354e-04, -1.800000027287751e-04, -5.999999848427251e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-steSta.mWat_flow=[1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, 1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -1.99999994947575e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -5.000000237487257e-04, -4.199999966658652e-04, -3.000000142492354e-04, -1.800000027287751e-04, -5.999999848427251e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_ReverseFlowHumidifier.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_ReverseFlowHumidifier.txt
deleted file mode 100644
index 4cb2d85c..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_ReverseFlowHumidifier.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-last-generated=2017-05-01
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "6",
- "linear": " "
-}
-senEnt1.h_out=[4.53009453125e+04, 4.53190468753785e+04, 4.53353125006854e+04, 4.535010546969165e+04, 4.536375000116997e+04, 4.537651562407159e+04, 4.538860937657685e+04, 4.540017968716065e+04, 4.541132422070228e+04, 4.542211327743624e+04, 4.543259374845459e+04, 4.544278515684837e+04, 4.545271484637458e+04, 4.546239844205416e+04, 4.547185156194237e+04, 4.548109374454014e+04, 4.54901367219421e+04, 4.549899218592839e+04, 4.550767577508932e+04, 4.551619922076165e+04, 4.552456640377618e+04, 4.553279297407716e+04, 4.554087890720461e+04, 4.554883984044963e+04, 4.555667578541999e+04, 4.556439453125e+04, 4.557200391345842e+04, 4.55795078044953e+04, 4.558690624912223e+04, 4.55942109435466e+04, 4.560142186645513e+04, 4.560854687330965e+04, 4.561558594250119e+04, 4.56225429596836e+04, 4.56294296850483e+04, 4.563623828527796e+04, 4.564297655291671e+04, 4.56496523405742e+04, 4.565626172187924e+04, 4.566280860305389e+04, 4.566929687114666e+04, 4.567573047104105e+04, 4.568210938332368e+04, 4.568843749548775e+04, 4.569471484524012e+04, 4.5700945319904e+04, 4.570713280734979e+04, 4.571327343822876e+04, 4.571937110026692e+04, 4.572543358797581e+04, 4.5731453125e+04, 4.57374335994496e+04, 4.574338282378744e+04, 4.574929298562528e+04, 4.575517186242736e+04, 4.576101952428848e+04, 4.576683202986697e+04, 4.577261719162103e+04, 4.577836719708315e+04, 4.578409376495679e+04, 4.578979295515292e+04, 4.579546483564763e+04, 4.580111327855852e+04, 4.580673437767285e+04, 4.581233203924061e+04, 4.581791016947456e+04, 4.582346092295299e+04, 4.58289960845254e+04, 4.583450780856057e+04, 4.584000000130852e+04, 4.584547656899587e+04, 4.585092969919256e+04, 4.58563671719658e+04, 4.586178905214387e+04, 4.586719140110919e+04, 4.5872578125e+04, 4.587795313010356e+04, 4.588330860395712e+04, 4.588865235900481e+04, 4.58939843635589e+04, 4.589929686866712e+04, 4.590460156123804e+04, 4.590989062878576e+04, 4.591517188380085e+04, 4.592043751377868e+04, 4.592569139372392e+04, 4.593093749251229e+04, 4.59361718725041e+04, 4.594139453373659e+04, 4.594660547620977e+04, 4.595181251238638e+04, 4.595700389267621e+04, 4.596219139761213e+04, 4.596736718379806e+04, 4.597253515747936e+04, 4.597769531864663e+04, 4.598284766727201e+04, 4.59879921727481e+04, 4.599312499023991e+04, 4.599825390136995e+04, 4.600337890625e+04]
-senEnt2.h_out=[4.53009453125e+04, 4.53190468753785e+04, 4.53353125006854e+04, 4.535010546969165e+04, 4.536375000116997e+04, 4.537651562407159e+04, 4.538860937657685e+04, 4.540017968716065e+04, 4.541132422070228e+04, 4.542211327743624e+04, 4.543259374845459e+04, 4.544278515684837e+04, 4.545271484637458e+04, 4.546239844205416e+04, 4.547185156194237e+04, 4.548109374454014e+04, 4.54901367219421e+04, 4.549899218592839e+04, 4.550767577508932e+04, 4.551619922076165e+04, 4.552456640377618e+04, 4.553279297407716e+04, 4.554087890720461e+04, 4.554883984044963e+04, 4.555667578541999e+04, 4.556439453125e+04, 4.557200391345842e+04, 4.55795078044953e+04, 4.558690624912223e+04, 4.55942109435466e+04, 4.560142186645513e+04, 4.560854687330965e+04, 4.561558594250119e+04, 4.56225429596836e+04, 4.56294296850483e+04, 4.563623828527796e+04, 4.564297655291671e+04, 4.56496523405742e+04, 4.565626172187924e+04, 4.566280860305389e+04, 4.566929687114666e+04, 4.567573047104105e+04, 4.568210938332368e+04, 4.568843749548775e+04, 4.569471484524012e+04, 4.5700945319904e+04, 4.570713280734979e+04, 4.571327343822876e+04, 4.571937110026692e+04, 4.572543358797581e+04, 4.5731453125e+04, 4.57374335994496e+04, 4.574338282378744e+04, 4.574929298562528e+04, 4.575517186242736e+04, 4.576101952428848e+04, 4.576683202986697e+04, 4.577261719162103e+04, 4.577836719708315e+04, 4.578409376495679e+04, 4.578979295515292e+04, 4.579546483564763e+04, 4.580111327855852e+04, 4.580673437767285e+04, 4.581233203924061e+04, 4.581791016947456e+04, 4.582346092295299e+04, 4.58289960845254e+04, 4.583450780856057e+04, 4.584000000130852e+04, 4.584547656899587e+04, 4.585092969919256e+04, 4.58563671719658e+04, 4.586178905214387e+04, 4.586719140110919e+04, 4.5872578125e+04, 4.587795313010356e+04, 4.588330860395712e+04, 4.588865235900481e+04, 4.58939843635589e+04, 4.589929686866712e+04, 4.590460156123804e+04, 4.590989062878576e+04, 4.591517188380085e+04, 4.592043751377868e+04, 4.592569139372392e+04, 4.593093749251229e+04, 4.59361718725041e+04, 4.594139453373659e+04, 4.594660547620977e+04, 4.595181251238638e+04, 4.595700389267621e+04, 4.596219139761213e+04, 4.596736718379806e+04, 4.597253515747936e+04, 4.597769531864663e+04, 4.598284766727201e+04, 4.59879921727481e+04, 4.599312499023991e+04, 4.599825390136995e+04, 4.600337890625e+04]
-time=[0e+00, 1e+00]
-senTem2.T=[2.931499938964844e+02, 2.931670227054328e+02, 2.931822204596256e+02, 2.931959838875885e+02, 2.932085876475621e+02, 2.93220367430788e+02, 2.932314453139529e+02, 2.932420349118001e+02, 2.932521972673985e+02, 2.932619934047652e+02, 2.93271484373613e+02, 2.932807312017085e+02, 2.932896728539363e+02, 2.932984008829808e+02, 2.933068847651248e+02, 2.933151855419637e+02, 2.933232727079157e+02, 2.93331176756421e+02, 2.933388976996212e+02, 2.933464965838139e+02, 2.933539123513328e+02, 2.933612060593896e+02, 2.933683471688055e+02, 2.933753662080089e+02, 2.933822631872772e+02, 2.933890686035156e+02, 2.933957214419497e+02, 2.934023132253824e+02, 2.934087829582204e+02, 2.93415161138033e+02, 2.934214477464484e+02, 2.934276428207741e+02, 2.934337463422562e+02, 2.934397888105559e+02, 2.934457702615437e+02, 2.934516601597061e+02, 2.934574584877992e+02, 2.934632263155945e+02, 2.934689331081609e+02, 2.934745483479201e+02, 2.934801330532755e+02, 2.934856567402458e+02, 2.934911193919688e+02, 2.934965209922739e+02, 2.93501892091117e+02, 2.935072326722002e+02, 2.935125122025747e+02, 2.935177307135091e+02, 2.93522918706738e+02, 2.935280761670729e+02, 2.93533203125e+02, 2.935382690477708e+02, 2.935433044529635e+02, 2.935483398577196e+02, 2.935533141981797e+02, 2.935582580506381e+02, 2.935631713855546e+02, 2.93568054202602e+02, 2.935729065020349e+02, 2.935777282838897e+02, 2.935825195199724e+02, 2.93587280266671e+02, 2.935920410133695e+02, 2.935967712424899e+02, 2.936014709540322e+02, 2.936061401479963e+02, 2.936108093137666e+02, 2.936154479901526e+02, 2.936200561490696e+02, 2.93624664307732e+02, 2.936292419488162e+02, 2.936337890723224e+02, 2.936383361685441e+02, 2.936428527747632e+02, 2.936473693805456e+02, 2.936518859863281e+02, 2.936563415570999e+02, 2.936608276451587e+02, 2.936652832157849e+02, 2.936697082424582e+02, 2.936741332955063e+02, 2.936785583485544e+02, 2.936829528840244e+02, 2.936873474192397e+02, 2.936917114373862e+02, 2.936960754289032e+02, 2.93700439446795e+02, 2.937047729471815e+02, 2.937091064474225e+02, 2.937134399475179e+02, 2.937177429304718e+02, 2.937220458872327e+02, 2.937263488698228e+02, 2.937306518524129e+02, 2.937349243174249e+02, 2.937391967824368e+02, 2.937434692474488e+02, 2.937477111698538e+02, 2.937519836344292e+02, 2.93756225581863e+02, 2.937604675292969e+02]
-senTem1.T=[2.931499938964844e+02, 2.931670227054328e+02, 2.931822204596256e+02, 2.931959838875885e+02, 2.932085876475621e+02, 2.93220367430788e+02, 2.932314453139529e+02, 2.932420349118001e+02, 2.932521972673985e+02, 2.932619934047652e+02, 2.93271484373613e+02, 2.932807312017085e+02, 2.932896728539363e+02, 2.932984008829808e+02, 2.933068847651248e+02, 2.933151855419637e+02, 2.933232727079157e+02, 2.93331176756421e+02, 2.933388976996212e+02, 2.933464965838139e+02, 2.933539123513328e+02, 2.933612060593896e+02, 2.933683471688055e+02, 2.933753662080089e+02, 2.933822631872772e+02, 2.933890686035156e+02, 2.933957214419497e+02, 2.934023132253824e+02, 2.934087829582204e+02, 2.93415161138033e+02, 2.934214477464484e+02, 2.934276428207741e+02, 2.934337463422562e+02, 2.934397888105559e+02, 2.934457702615437e+02, 2.934516601597061e+02, 2.934574584877992e+02, 2.934632263155945e+02, 2.934689331081609e+02, 2.934745483479201e+02, 2.934801330532755e+02, 2.934856567402458e+02, 2.934911193919688e+02, 2.934965209922739e+02, 2.93501892091117e+02, 2.935072326722002e+02, 2.935125122025747e+02, 2.935177307135091e+02, 2.93522918706738e+02, 2.935280761670729e+02, 2.93533203125e+02, 2.935382690477708e+02, 2.935433044529635e+02, 2.935483398577196e+02, 2.935533141981797e+02, 2.935582580506381e+02, 2.935631713855546e+02, 2.93568054202602e+02, 2.935729065020349e+02, 2.935777282838897e+02, 2.935825195199724e+02, 2.93587280266671e+02, 2.935920410133695e+02, 2.935967712424899e+02, 2.936014709540322e+02, 2.936061401479963e+02, 2.936108093137666e+02, 2.936154479901526e+02, 2.936200561490696e+02, 2.93624664307732e+02, 2.936292419488162e+02, 2.936337890723224e+02, 2.936383361685441e+02, 2.936428527747632e+02, 2.936473693805456e+02, 2.936518859863281e+02, 2.936563415570999e+02, 2.936608276451587e+02, 2.936652832157849e+02, 2.936697082424582e+02, 2.936741332955063e+02, 2.936785583485544e+02, 2.936829528840244e+02, 2.936873474192397e+02, 2.936917114373862e+02, 2.936960754289032e+02, 2.93700439446795e+02, 2.937047729471815e+02, 2.937091064474225e+02, 2.937134399475179e+02, 2.937177429304718e+02, 2.937220458872327e+02, 2.937263488698228e+02, 2.937306518524129e+02, 2.937349243174249e+02, 2.937391967824368e+02, 2.937434692474488e+02, 2.937477111698538e+02, 2.937519836344292e+02, 2.93756225581863e+02, 2.937604675292969e+02]
-senMas1.X=[9.999999776482582e-03, 1.000033318997179e-02, 1.000066660346079e-02, 1.000099908562763e-02, 1.000133249911683e-02, 1.000166498122136e-02, 1.000199839477205e-02, 1.000233087687699e-02, 1.000266335910593e-02, 1.000299584108688e-02, 1.000332832331499e-02, 1.000366080554338e-02, 1.000399328777246e-02, 1.000432576999932e-02, 1.000465825198082e-02, 1.000498980264031e-02, 1.000532228511475e-02, 1.000565383577395e-02, 1.00059863177524e-02, 1.00063178689076e-02, 1.00066494195668e-02, 1.000698097072172e-02, 1.000731345270045e-02, 1.000764500335771e-02, 1.000797562319145e-02, 1.000830717384815e-02, 1.000863872500002e-02, 1.000897027516656e-02, 1.000930182631787e-02, 1.000963244614772e-02, 1.000996399631426e-02, 1.001029461614356e-02, 1.001062616729542e-02, 1.001095678613939e-02, 1.001128740596868e-02, 1.001161802579797e-02, 1.001194957596452e-02, 1.001228019579381e-02, 1.00126108156231e-02, 1.001294143544573e-02, 1.001327112297379e-02, 1.001360174280308e-02, 1.001393236263237e-02, 1.001426298147634e-02, 1.001459266998306e-02, 1.001492328981235e-02, 1.001525297733374e-02, 1.001558359716304e-02, 1.001591328566975e-02, 1.001624297319115e-02, 1.001657359302044e-02, 1.001690328152715e-02, 1.001723297003386e-02, 1.001756265854058e-02, 1.001789234507667e-02, 1.001822203358339e-02, 1.001855172209009e-02, 1.001888047927424e-02, 1.001921016778095e-02, 1.001953985627545e-02, 1.001986861151229e-02, 1.00201983000079e-02, 1.002052705719425e-02, 1.002085674569652e-02, 1.002118550288288e-02, 1.002151426006702e-02, 1.002184394660312e-02, 1.002217270378726e-02, 1.002250146097139e-02, 1.002283021815553e-02, 1.002315897533967e-02, 1.002348773251381e-02, 1.002381648773733e-02, 1.002414524492147e-02, 1.002447307078747e-02, 1.002480182796717e-02, 1.002513058514686e-02, 1.002545841101287e-02, 1.002578716818368e-02, 1.002611499209795e-02, 1.002644374927209e-02, 1.002677157513365e-02, 1.002709940099522e-02, 1.002742722685678e-02, 1.002775505271834e-02, 1.002808380793187e-02, 1.002841163379343e-02, 1.002873945965499e-02, 1.002906635419398e-02, 1.002939418005554e-02, 1.0029722005906e-02, 1.003004982980805e-02, 1.003037672435481e-02, 1.003070455021194e-02, 1.003103237606906e-02, 1.003135927060361e-02, 1.003168709646073e-02, 1.003201398905242e-02, 1.003234088358696e-02, 1.003266777812151e-02, 1.003299560397863e-02]
-senMas2.X=[9.999999776482582e-03, 1.000033318997179e-02, 1.000066660346079e-02, 1.000099908562763e-02, 1.000133249911683e-02, 1.000166498122136e-02, 1.000199839477205e-02, 1.000233087687699e-02, 1.000266335910593e-02, 1.000299584108688e-02, 1.000332832331499e-02, 1.000366080554338e-02, 1.000399328777246e-02, 1.000432576999932e-02, 1.000465825198082e-02, 1.000498980264031e-02, 1.000532228511475e-02, 1.000565383577395e-02, 1.00059863177524e-02, 1.00063178689076e-02, 1.00066494195668e-02, 1.000698097072172e-02, 1.000731345270045e-02, 1.000764500335771e-02, 1.000797562319145e-02, 1.000830717384815e-02, 1.000863872500002e-02, 1.000897027516656e-02, 1.000930182631787e-02, 1.000963244614772e-02, 1.000996399631426e-02, 1.001029461614356e-02, 1.001062616729542e-02, 1.001095678613939e-02, 1.001128740596868e-02, 1.001161802579797e-02, 1.001194957596452e-02, 1.001228019579381e-02, 1.00126108156231e-02, 1.001294143544573e-02, 1.001327112297379e-02, 1.001360174280308e-02, 1.001393236263237e-02, 1.001426298147634e-02, 1.001459266998306e-02, 1.001492328981235e-02, 1.001525297733374e-02, 1.001558359716304e-02, 1.001591328566975e-02, 1.001624297319115e-02, 1.001657359302044e-02, 1.001690328152715e-02, 1.001723297003386e-02, 1.001756265854058e-02, 1.001789234507667e-02, 1.001822203358339e-02, 1.001855172209009e-02, 1.001888047927424e-02, 1.001921016778095e-02, 1.001953985627545e-02, 1.001986861151229e-02, 1.00201983000079e-02, 1.002052705719425e-02, 1.002085674569652e-02, 1.002118550288288e-02, 1.002151426006702e-02, 1.002184394660312e-02, 1.002217270378726e-02, 1.002250146097139e-02, 1.002283021815553e-02, 1.002315897533967e-02, 1.002348773251381e-02, 1.002381648773733e-02, 1.002414524492147e-02, 1.002447307078747e-02, 1.002480182796717e-02, 1.002513058514686e-02, 1.002545841101287e-02, 1.002578716818368e-02, 1.002611499209795e-02, 1.002644374927209e-02, 1.002677157513365e-02, 1.002709940099522e-02, 1.002742722685678e-02, 1.002775505271834e-02, 1.002808380793187e-02, 1.002841163379343e-02, 1.002873945965499e-02, 1.002906635419398e-02, 1.002939418005554e-02, 1.0029722005906e-02, 1.003004982980805e-02, 1.003037672435481e-02, 1.003070455021194e-02, 1.003103237606906e-02, 1.003135927060361e-02, 1.003168709646073e-02, 1.003201398905242e-02, 1.003234088358696e-02, 1.003266777812151e-02, 1.003299560397863e-02]
-cheMas.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-cheEnt.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-cheTem.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_ReverseFlowMassExchanger.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_ReverseFlowMassExchanger.txt
deleted file mode 100644
index 528bc8ae..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_ReverseFlowMassExchanger.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-last-generated=2016-11-02
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 1, 1, 1, 1, 1, 1, 1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-senEnt1.h_out=[53417.265625, 53417.265625]
-senEnt2.h_out=[53417.265625, 53417.265625]
-time=[0., 1.]
-senTem2.T=[301.149993896484375, 301.149993896484375]
-senTem1.T=[301.149993896484375, 301.149993896484375]
-senMas1.X=[0.00999999977648258209, 0.00999999977648258209]
-senMas2.X=[0.00999999977648258209, 0.00999999977648258209]
-cheMas.y=[0., 0.]
-cheEnt.y=[0., 0.]
-cheTem1.y=[0., 0.]
-cheTem.y=[0., 0.]
-cheMas1.y=[0., 0.]
-cheEnt1.y=[0., 0.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_StaticTwoPortConservationEquation.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_StaticTwoPortConservationEquation.txt
new file mode 100644
index 00000000..47fea0ff
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Interfaces_Examples_StaticTwoPortConservationEquation.txt
@@ -0,0 +1,18 @@
+last-generated=2015-07-17
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+modWatNoRev.conEqn.sta_b.T=[290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125]
+modWatRev.conEqn.sta_a.T=[293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375]
+modAirNoRev.conEqn.sta_b.T=[283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375]
+time=[0., 3600.]
+modWatRev.conEqn.sta_b.T=[290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 290.75994873046875, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125, 295.540069580078125]
+modAirRev.conEqn.sta_b.T=[283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 283.293304443359375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375, 303.006683349609375]
+modAirRev.conEqn.sta_a.X[1]=[0.00999999977648258209, 0.00999999977648258209]
+modAirRev.conEqn.sta_b.X[1]=[0.00999999977648258209, 0.00999999977648258209]
+modAirNoRev.conEqn.sta_b.X[1]=[0.00999999977648258209, 0.00999999977648258209]
+QSen_flow.y=[-100., -100., -100., -100., -100., -100., -100., -100., -100., -100., -100., -100., -100., -100., -100., -100., -100., -100., -100., -100., -100., -100., -100., -100., -100., -100., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100., 100.]
+mWat_flow.y=[0., 0.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MassExchangers_Examples_ConstantEffectiveness.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MassExchangers_Examples_ConstantEffectiveness.txt
deleted file mode 100644
index f78d1d77..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MassExchangers_Examples_ConstantEffectiveness.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-last-generated=2015-08-05
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "0, 0",
- "linear": " "
-}
-hex.m2_flow=[1.11803400516510009766, 2.06155278162408484022, 2.69258239777957619765, 3.20156214101651093173, 3.64005498435965524351, 4.03112888336181640625, 4.38748212977640594801, 4.71699040303298833265, 5.02493769259115907744, 5.31507289304439378697, 5.5901699066162109375, 5.85234986631421527647, 6.103277630961694733, 6.34428887590983858757, 6.57647313907138109101, 6.8007354736328125, 7.01783427687572114451, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375, 7.1589107513427734375]
-hex.m1_flow=[5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.24404430389404296875, 5.19615208753890467364, 5.0497523609489274321, 4.89897940347513394244, 4.7434163093566903413, 4.58257607452867343767, 4.41588077695535563549, 4.24263989336133917618, 4.06201903367009276025, 3.87298345565795898438, 3.67423497285181044347, 3.46410228257079699787, 3.24036948307884342668, 2.99999957255236004983, 2.73861289024353027344, 2.44949034470476423309, 2.12132142715363647412, 1.73204926954038951337, 1.58113884925842285156, 1.58113884925842285156, 1.58113884925842285156, 1.58113884925842285156, 1.58113884925842285156, 1.58113884925842285156, 1.58113884925842285156, 1.58113884925842285156, 1.58113884925842285156, 1.58113884925842285156, 1.58113884925842285156, 1.58113884925842285156, 1.58113884925842285156, 1.58113884925842285156, 1.58113884925842285156, 1.58113884925842285156, 1.58113884925842285156]
-time=[0., 360.]
-hex.sta_a2.X[1]=[0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209]
-hex.sta_b1.X[1]=[0.01165887899696826935, 0.01137100345817751955, 0.01117847113918779903, 0.01102317777299773212, 0.01088938953900086409, 0.01077007036656141281, 0.01066134405505120286, 0.01056080872400575431, 0.0104668512748521108, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627, 0.01040000002831220627]
-hex.sta_a1.X[1]=[0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836, 0.01200000010430812836]
-hex.sta_b2.X[1]=[0.01159999985247850418, 0.01159999985247850418, 0.01159999985247850418, 0.01159999985247850418, 0.01159999985247850418, 0.01159999985247850418, 0.01159999985247850418, 0.01159999985247850418, 0.01159999985247850418, 0.01157861858491388701, 0.0115009332075715065, 0.01143369262273851751, 0.01137474832381276703, 0.01132252345691322007, 0.01127583162891609286, 0.01123375911265611649, 0.01119559256693139319, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01117203198373317719, 0.01116132826596016522, 0.01112860816542370415, 0.01109491096578106746, 0.0110601428896188736, 0.01102419483136261348, 0.0109869392008380088, 0.01094822013336268704, 0.01090785202060682961, 0.01086560264229774475, 0.01082118328902152704, 0.01077421864038592692, 0.01072421559158965101, 0.01067049326134726986, 0.01061207335442304611, 0.01054745551483095463, 0.01047411028579814211, 0.0103871092557602674, 0.01035338081419467926, 0.01035338081419467926, 0.01035338081419467926, 0.01035338081419467926, 0.01035338081419467926, 0.01035338081419467926, 0.01035338081419467926, 0.01035338081419467926, 0.01035338081419467926, 0.01035338081419467926, 0.01035338081419467926, 0.01035338081419467926, 0.01035338081419467926, 0.01035338081419467926, 0.01035338081419467926, 0.01035338081419467926, 0.01035338081419467926]
-hex.dp2=[5., 17.0000003178912706403, 29.00000063578254128061, 40.99999936421694712863, 53.00000127156609153189, 65., 76.99999872843558534896, 88.99999745687119911963, 101.00000254312881509122, 112.99999491374236981756, 125., 137.00000508624145822978, 148.9999974568792424634, 161.0000025431207575366, 172.99999491375857019193, 185., 197.00000508624145822978, 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205., 205.]
-hex.dp1=[110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 110., 107.99999491375851334851, 102.00000508624144401892, 95.99998982751711196215, 90.00000000000004263256, 84.00001017248293067041, 78.00002034496587555168, 71.99997965503412444832, 65.99998982751711196215, 60., 54.00001017251522483775, 48.00002034503054204606, 41.99997965496945795394, 35.99998982748468279169, 30., 24.00001017251522483775, 18.00002034503054204606, 11.99997965498562457753, 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10.]
-hex.mWat2_flow=[0.00178885436616837978, 0.00329848451728124645, 0.00430813203537767919, 0.0051224995001321813, 0.00582408818806201458, 0.00644980603829026222, 0.00701997143893483451, 0.00754718471637822429, 0.00803990020234778349, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00839047040790319443, 0.00831384378411287837, 0.00807960444657659406, 0.00783836706791155198, 0.00758946640416979963, 0.00733212146443666495, 0.0070654097810521517, 0.00678822395008030297, 0.00649923035850567734, 0.00619677314534783363, 0.00587877593122939409, 0.00554256397620593935, 0.00518459141431586602, 0.00479999954407180161, 0.00438178051263093948, 0.00391918456270543263, 0.00339411434379219279, 0.00277127899331252149, 0.00252982205711305141, 0.00252982205711305141, 0.00252982205711305141, 0.00252982205711305141, 0.00252982205711305141, 0.00252982205711305141, 0.00252982205711305141, 0.00252982205711305141, 0.00252982205711305141, 0.00252982205711305141, 0.00252982205711305141, 0.00252982205711305141, 0.00252982205711305141, 0.00252982205711305141, 0.00252982205711305141, 0.00252982205711305141, 0.00252982205711305141]
-hex.mWat1_flow=[-0.00178885436616837978, -0.00329848451728124645, -0.00430813203537767919, -0.0051224995001321813, -0.00582408818806201458, -0.00644980603829026222, -0.00701997143893483451, -0.00754718471637822429, -0.00803990020234778349, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00839047040790319443, -0.00831384378411287837, -0.00807960444657659406, -0.00783836706791155198, -0.00758946640416979963, -0.00733212146443666495, -0.0070654097810521517, -0.00678822395008030297, -0.00649923035850567734, -0.00619677314534783363, -0.00587877593122939409, -0.00554256397620593935, -0.00518459141431586602, -0.00479999954407180161, -0.00438178051263093948, -0.00391918456270543263, -0.00339411434379219279, -0.00277127899331252149, -0.00252982205711305141, -0.00252982205711305141, -0.00252982205711305141, -0.00252982205711305141, -0.00252982205711305141, -0.00252982205711305141, -0.00252982205711305141, -0.00252982205711305141, -0.00252982205711305141, -0.00252982205711305141, -0.00252982205711305141, -0.00252982205711305141, -0.00252982205711305141, -0.00252982205711305141, -0.00252982205711305141, -0.00252982205711305141, -0.00252982205711305141]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Examples_MixingVolumeHeatConduction.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Examples_MixingVolumeHeatConduction.txt
deleted file mode 100644
index 02e2eb58..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Examples_MixingVolumeHeatConduction.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': '0, 0'}
-vol.ports[1].m_flow=[0.00999999977648258209, 0.00980000011175867491, 0.00960000044703476947, 0.00939999985098829982, 0.00920000018626438223, 0.00899999962747108188, 0.008799999925493995, 0.00860000029802314089, 0.00839999966472450635, 0.00820000011175910787, 0.00800000040978140516, 0.00779999977648265438, 0.00760000007450550592, 0.00739999990686832001, 0.00719999988824135753, 0.00700000033527540567, 0.00680000001862605171, 0.00659999999999978312, 0.00639999998137434807, 0.00620000013038489364, 0.00600000011175834749, 0.00579999979510982793, 0.00559999977648272668, 0.00540000022351691273, 0.0051999999068683923, 0.00499999988824129105, 0.00480000003725183661, 0.00460000031664837584, 0.00439999999999985542, 0.00419999968335133499, 0.00400000042840694108, 0.00380000011175842022, 0.00359999979510989936, 0.0034000003073348618, 0.00319999999068675727, 0.0029999999068677707, 0.00280000018626444871, 0.00260000010244546128, 0.00240000001862647342, 0.00219999970197684233, 0.00200000021420347011, 0.00179999989755474216, 0.0015999996973209878, 0.00140000009313222436, 0.00120000000931323671, 0.00099999980907892745, 0.0008000001466830234, 0.0006000000046566537, 0.00039999977531894756, 0.00020000018568204714, 0., -0.00020000018567920501, -0.0004000003713585488, -0.00060000060069273628, -0.0007999995506446021, -0.00099999980908248125, -0.00120000000931252742, -0.00140000009313009151, -0.00160000029336155886, -0.00180000049359302599, -0.00199999961816496033, -0.00219999970198110585, -0.00240000001862789459, -0.00260000010244404011, -0.0028000001862601852, -0.00300000050290697437, -0.00319999939465131795, -0.00339999971129505401, -0.0035999997951120322, -0.00380000011175912972, -0.0040000004284033875, -0.00420000027939277515, -0.0043999994039655415, -0.00459999972060677956, -0.00480000003725467896, -0.00499999988824129105, -0.00520000020488697, -0.00540000052153264895, -0.00560000037252370107, -0.00579999949709480295, -0.0059999998137404819, -0.00620000013038418413, -0.00639999998137221523, -0.00660000029801622885, -0.0068000006146619078, -0.0069999997392341199, -0.00719999959022406179, -0.00739999990686974075, -0.0076000002235154197, -0.00780000007450314201, -0.00800000085680122562, -0.00819999951571714729, -0.00839999936671152921, -0.00860000014901294435, -0.00880000000000097544, -0.0089999998509861668, -0.0092000006332853615, -0.00939999929220017121, -0.00960000007450935791, -0.00979999992549597, -0.00999999977648258209]
-time=[0., 1.]
-vol.heatPort.Q_flow=[-100.7217559814453125, -99.71163175204787876282, -98.68074030979165911504, -97.62844078549002801992, -96.55404653358893085624, -95.45687111515199774203, -94.33616622959678466032, -93.19116977318827821364, -92.02109506389658122316, -90.82509656186633151265, -89.60230273510646270552, -88.35181419446796269312, -87.07266200569600300696, -85.76386960648724766543, -84.42438515138638877033, -83.05310904042394781754, -81.64890238363217633832, -80.21057154875227013235, -78.73684798826218411705, -77.22640954659328826892, -75.67786454085621983268, -74.08975876944292338067, -72.46056346242625068044, -70.78864358817820345848, -69.07231046595606471783, -67.3097686767578125, -65.49912849388411473228, -63.63838779109028109815, -61.7254335802021927293, -59.75804734140613305726, -57.73387390074418590302, -55.65040638632934388852, -53.50500713556491660938, -51.29488284635132089306, -49.01704107725223025227, -46.66832972009859759055, -44.24539917012423728693, -41.74466063153460027024, -39.16230266901474976748, -36.49427787594201788579, -33.73624586769190614177, -30.88356867613454426191, -27.93128953485194188033, -24.87411339316946623512, -21.70632666664525345368, -18.42182712868990535071, -15.01405432358018110506, -11.47591356996904110588, -7.79978777620562091499, -3.97745788850875436893, 0., -1.9887289442267881423, -3.89989946668923925799, -5.73796213913816988139, -7.50702197994971154316, -9.2109135643747812594, -10.85316333331688554154, -12.43705669656820056446, -13.96564924158997555992, -15.44178865052292159987, -16.86811874628386576092, -18.24713893800001329737, -19.58115133451672917886, -20.87233031575830111137, -22.12269958503597067079, -23.33416840769427480495, -24.50851708439369858183, -25.6474380789245088863, -26.75250356779410410013, -27.82520319316840939905, -28.86693695035390305748, -29.8790266403041329113, -30.86271389215270488648, -31.81919108229119430575, -32.74956424695513845791, -33.65488433837890625, -34.53615652776407785041, -35.39432305277479429151, -36.23028418442134324096, -37.04487818336401971919, -37.83893110036246554273, -38.61320477329392275578, -39.36842399412316240159, -40.10528685639877721769, -40.82445330547707129654, -41.52655244968524073101, -42.21219156383093462637, -42.88193480324834183648, -43.53633148451651635469, -44.17590803749517647248, -44.80115274630828281488, -45.41254647600688088005, -46.01054664870336097238, -46.59558445458035436104, -47.16808332566134254193, -47.72843617584360487172, -48.27702447778516869903, -48.81421890436137545066, -49.34036918296126117411, -49.85581539989750154973, -50.36087799072265625]
-vol.heatPort.T=[303.22216796875, 303.1211547828711445618, 303.0180664015842921799, 302.91284178973319285433, 302.80541991214795416454, 302.69567871917979573482, 302.58361814883755869232, 302.46911621437993744621, 302.35211179520598534509, 302.23251347089887985931, 302.11022951058197349994, 301.98516844948244397528, 301.8572692523212595006, 301.72637933130329201958, 301.59243775219874805771, 301.45532234811599892055, 301.31488032018035028159, 301.17105105136573683922, 301.02368174703565273376, 300.87265010992274483215, 300.71777348411148977902, 300.55899037276890339854, 300.39605710918846170898, 300.22885138889961353925, 300.05722036550668008204, 299.8809814453125, 299.69992047880111840641, 299.51382466474348120755, 299.32254030626785379354, 299.12579329010293349711, 298.92340112283221742473, 298.71502690574550342717, 298.50048812507191087207, 298.27948027379841278162, 298.05169685979836913248, 297.8168333534852649791, 297.57455479413260945876, 297.32446301140566902177, 297.06622301902120852901, 296.79943808715404429677, 296.52362077208783830429, 296.23834218103752391471, 295.94311483920034788753, 295.63742087606760833296, 295.32061759861989003184, 294.99218709982312702778, 294.6513979937329850145, 294.29757686115056003473, 293.9299922720755375849, 293.54776037996560944521, 293.149993896484375, 293.34887713822223531679, 293.53997838356860938802, 293.72378591421005467055, 293.90069542687609782661, 294.07110575676392727473, 294.23532100632240826599, 294.39370738627434320733, 294.54657007403454826999, 294.69418372857120402841, 294.83682217434966332803, 294.97470073325132489117, 295.10812371650644081456, 295.23724371273317501618, 295.36227434541501679632, 295.48342923847189922526, 295.60086029157326947825, 295.7147520093308230571, 295.8252562695137726223, 295.93252565990439961752, 296.03668225095839261485, 296.13790914901983342133, 296.23626681176136798967, 296.33190899924682071287, 296.42495718764405410184, 296.5155029296875, 296.60360726053335156394, 296.6894227686543672462, 296.77304100678486520337, 296.85449201429878485214, 296.93389883210488733312, 297.01132200322149401472, 297.08685308049371087691, 297.16052258215290748922, 297.23245257825743692592, 297.30264265674037460485, 297.3712157231801143098, 297.43820187264697096907, 297.50363162257366411723, 297.56759652569445506742, 297.63012710009684269608, 297.69125350324151213499, 297.75106801617391738546, 297.80957027102772372018, 297.8668213025231921165, 297.92285162834627953998, 297.97769176662205836692, 298.03143295311275551285, 298.08404531062285514054, 298.13558955086131163625, 298.18609619140625]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Examples_MixingVolumeMoistAir.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Examples_MixingVolumeMoistAir.txt
deleted file mode 100644
index a11a9503..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Examples_MixingVolumeMoistAir.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2017-04-14
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1",
- "number of continuous time states": "7",
- "linear": " "
-}
-vol1.T=[2.931499938964844e+02, 2.8405419921875e+02, 2.947752380371094e+02, 2.948536376953125e+02, 2.910711364746094e+02, 2.943646850585938e+02, 2.928442077636719e+02, 2.92969970703125e+02, 2.934234313964844e+02, 2.929742126464844e+02, 2.932044372558594e+02, 2.931670227050781e+02, 2.931146545410156e+02, 2.93175048828125e+02, 2.931408996582031e+02, 2.931487731933594e+02, 2.931544799804688e+02, 2.93146484375e+02, 2.931514587402344e+02, 2.931500244140625e+02, 2.931494445800781e+02, 2.931504821777344e+02, 2.931497802734375e+02, 2.931500244140625e+02, 2.931500549316406e+02, 2.931499328613281e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-time=[0e+00, 6e+02]
-vol1.X_w=[9.999999776482582e-03, 5.273618269711733e-03, 4.973482806235552e-03, 4.997458308935165e-03, 5.000112112611532e-03, 5.000019911676645e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03]
-QLat.u=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-QSen.u=[0e+00, -1.75760400390625e+03, 2.56724755859375e+03, -1.698935302734375e+03, 5.452106323242188e+02, 1.477107849121094e+02, -3.336661071777344e+02, 2.412713012695311e+02, -9.015668487548828e+01, -9.639481544494629e+00, 4.206141662597656e+01, -3.375034713745117e+01, 1.432545375823975e+01, -1.728983223438263e-01, -5.170102119445761e+00, 4.652145862579346e+00, -2.206856727600098e+00, 2.295756638050158e-01, 6.154723167419434e-01, -6.3087397813797e-01, 3.305967748165131e-01, -5.91459833085537e-02, -7.000113278627396e-02, 8.36414247751236e-02, -4.792823269963264e-02, 1.156995911151171e-02, 7.222689688205719e-03, -1.051348727196455e-02, 6.573250517249099e-03, -1.940549234859645e-03, -2.309609844814986e-04, 1.136934035457671e-03, -1.205079606734216e-03, -2.741982996212755e-07, 1.473026204621411e-04, 9.480088920099661e-06, -1.353471907350468e-05, -8.582631380704697e-06, -3.630544370025746e-06, -2.436941258565639e-06, -1.703047132650681e-06, -9.69164375419499e-07, -2.352703063479566e-07, 4.187145918876922e-08, 3.849494589758251e-08, 3.51184326063958e-08, 3.173055063143693e-08, 2.835403734025022e-08, 2.497752227270666e-08, 2.160100898151995e-08, 1.821312700656108e-08, 1.503129531954528e-08, 1.415004291516198e-08, 1.328015830637241e-08, 1.239890501381069e-08, 1.151765172124897e-08, 1.06477671124594e-08, 9.76651381989769e-09, 8.89663009928654e-09, 8.015376806724817e-09, 7.145492197935255e-09, 6.264238905373531e-09, 5.39435429658397e-09, 4.513101448111456e-09, 3.631848155549733e-09, 2.761963546760171e-09, 1.880710476243053e-09, 1.010825978475793e-09, 1.295728246919477e-10, 1.146122988182619e-10, 1.18165616180832e-10, 1.103502567101344e-10, 1.02534890300543e-10, 1.06088214602007e-10, 9.827284819241555e-11, 1.018261724938796e-10, 9.401080608428813e-11, 8.619543967469667e-11, 7.838008020399911e-11, 8.193339756656925e-11, 7.41180380958717e-11, 7.767135545844176e-11, 6.985598904885045e-11, 6.204062957815282e-11, 5.422526316856136e-11, 5.777858400057845e-11, 4.996322106043394e-11, 5.351654189245103e-11, 4.570117895230652e-11, 3.788581254271506e-11, 4.143913337473215e-11, 3.362377043458764e-11, 2.580840749444313e-11, 2.936172832646022e-11, 2.154636365159224e-11, 1.373099984408599e-11, 1.728431980874134e-11, 9.468956001235096e-12, 1.6535925189895e-12, 5.206912592065072e-12, -2.608450998600742e-12]
-vol1.p=[1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05, 1.01325e+05]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Examples_MixingVolumePrescribedHeatFlowRate.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Examples_MixingVolumePrescribedHeatFlowRate.txt
deleted file mode 100644
index d70ca7f4..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Examples_MixingVolumePrescribedHeatFlowRate.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-last-generated=2016-03-18
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": "0"
-}
-vol.ports[1].m_flow=[0.00999999977648258209, 0.00980000011175867491, 0.00960000044703476947, 0.00939999985098829982, 0.00920000018626438223, 0.00899999962747108188, 0.008799999925493995, 0.00860000029802314089, 0.00839999966472450635, 0.00820000011175910787, 0.00800000040978140516, 0.00779999977648265438, 0.00760000007450550592, 0.00739999990686832001, 0.00719999988824135753, 0.00700000033527540567, 0.00680000001862605171, 0.00659999999999978312, 0.00639999998137434807, 0.00620000013038489364, 0.00600000011175834749, 0.00579999979510982793, 0.00559999977648272668, 0.00540000022351691273, 0.0051999999068683923, 0.00499999988824129105, 0.00480000003725183661, 0.00460000031664837584, 0.00439999999999985542, 0.00419999968335133499, 0.00400000042840694108, 0.00380000011175842022, 0.00359999979510989936, 0.0034000003073348618, 0.00319999999068675727, 0.0029999999068677707, 0.00280000018626444871, 0.00260000010244546128, 0.00240000001862647342, 0.00219999970197684233, 0.00200000021420347011, 0.00179999989755474216, 0.0015999996973209878, 0.00140000009313222436, 0.00120000000931323671, 0.00099999980907892745, 0.0008000001466830234, 0.0006000000046566537, 0.00039999977531894756, 0.00020000018568204714, 0., -0.00020000018567920501, -0.0004000003713585488, -0.00060000060069273628, -0.0007999995506446021, -0.00099999980908248125, -0.00120000000931252742, -0.00140000009313009151, -0.00160000029336155886, -0.00180000049359302599, -0.00199999961816496033, -0.00219999970198110585, -0.00240000001862789459, -0.00260000010244404011, -0.0028000001862601852, -0.00300000050290697437, -0.00319999939465131795, -0.00339999971129505401, -0.0035999997951120322, -0.00380000011175912972, -0.0040000004284033875, -0.00420000027939277515, -0.0043999994039655415, -0.00459999972060677956, -0.00480000003725467896, -0.00499999988824129105, -0.00520000020488697, -0.00540000052153264895, -0.00560000037252370107, -0.00579999949709480295, -0.0059999998137404819, -0.00620000013038418413, -0.00639999998137221523, -0.00660000029801622885, -0.0068000006146619078, -0.0069999997392341199, -0.00719999959022406179, -0.00739999990686974075, -0.0076000002235154197, -0.00780000007450314201, -0.00800000085680122562, -0.00819999951571714729, -0.00839999936671152921, -0.00860000014901294435, -0.00880000000000097544, -0.0089999998509861668, -0.0092000006332853615, -0.00939999929220017121, -0.00960000007450935791, -0.00979999992549597, -0.00999999977648258209]
-time=[0., 1.]
-vol.heatPort.Q_flow=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
-vol.heatPort.T=[313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 308.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolume.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolume.txt
new file mode 100644
index 00000000..d4634be0
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolume.txt
@@ -0,0 +1,16 @@
+last-generated=2017-05-01
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "12",
+ "linear": " "
+}
+vol.medium.T=[2.931499938964844e+02, 2.931514587402241e+02, 2.931510620117051e+02, 2.93150756835917e+02, 2.93150543212877e+02, 2.931503906250114e+02, 2.931502685546875e+02, 2.931502075195312e+02, 2.93150146484375e+02, 2.931501159667969e+02, 2.931500854492188e+02, 2.931500549316406e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931498718260264e+02, 2.931497497560231e+02, 2.931496887207031e+02, 2.931496276854195e+02, 2.931495666503906e+02, 2.931495056152344e+02, 2.931494750975471e+02, 2.931494140625e+02, 2.931493530273983e+02, 2.931493225096747e+02, 2.931492309572495e+02, 2.931491394043696e+02, 2.929998470996076e+02, 2.921370834458679e+02, 2.910178534783285e+02, 2.898335872264078e+02, 2.886855454361641e+02, 2.876335761578069e+02, 2.86709106244642e+02, 2.859233695236852e+02, 2.852741399022806e+02, 2.847507323677238e+02, 2.843379512805158e+02, 2.840188296182599e+02, 2.83776611328125e+02, 2.835989988853422e+02, 2.834717100071754e+02, 2.833805234690407e+02, 2.833151856689999e+02, 2.832683411132012e+02, 2.832348022530788e+02, 2.832107543805616e+02, 2.831935424570406e+02, 2.831811828349169e+02, 2.831723632994396e+02, 2.831660156328579e+02, 2.831614685077511e+02, 2.831582336412685e+02, 2.831558837864432e+02, 2.831542358365696e+02, 2.831530151395199e+02, 2.831521606458045e+02, 2.831515502934053e+02, 2.831511230467659e+02, 2.831507873533337e+02, 2.831505737301413e+02, 2.831504211430147e+02, 2.831502990722656e+02, 2.831502075196768e+02, 2.83150146484375e+02, 2.831501159667969e+02, 2.831500854492188e+02, 2.831500549316406e+02, 2.831500549316406e+02, 2.831500244140625e+02, 2.831500244140625e+02, 2.831500244140625e+02, 2.831500244140625e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02]
+vol1.T=[2.931499938964844e+02, 2.931514587402241e+02, 2.931510620117051e+02, 2.93150756835917e+02, 2.93150543212877e+02, 2.931503906250114e+02, 2.931502685546875e+02, 2.931502075195312e+02, 2.93150146484375e+02, 2.931501159667969e+02, 2.931500854492188e+02, 2.931500549316406e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931498718260264e+02, 2.931497497560231e+02, 2.931496887207031e+02, 2.931496276854195e+02, 2.931495666503906e+02, 2.931495056152344e+02, 2.931494750975471e+02, 2.931494140625e+02, 2.931493530273983e+02, 2.931493225096747e+02, 2.931492309572495e+02, 2.931491394043696e+02, 2.929998470996076e+02, 2.921370834458679e+02, 2.910178534783285e+02, 2.898335872264078e+02, 2.886855454361641e+02, 2.876335761578069e+02, 2.86709106244642e+02, 2.859233695236852e+02, 2.852741399022806e+02, 2.847507323677238e+02, 2.843379512805158e+02, 2.840188296182599e+02, 2.83776611328125e+02, 2.835989988853422e+02, 2.834717100071754e+02, 2.833805234690407e+02, 2.833151856689999e+02, 2.832683411132012e+02, 2.832348022530788e+02, 2.832107543805616e+02, 2.831935424570406e+02, 2.831811828349169e+02, 2.831723632994396e+02, 2.831660156328579e+02, 2.831614685077511e+02, 2.831582336412685e+02, 2.831558837864432e+02, 2.831542358365696e+02, 2.831530151395199e+02, 2.831521606458045e+02, 2.831515502934053e+02, 2.831511230467659e+02, 2.831507873533337e+02, 2.831505737301413e+02, 2.831504211430147e+02, 2.831502990722656e+02, 2.831502075196768e+02, 2.83150146484375e+02, 2.831501159667969e+02, 2.831500854492188e+02, 2.831500549316406e+02, 2.831500549316406e+02, 2.831500244140625e+02, 2.831500244140625e+02, 2.831500244140625e+02, 2.831500244140625e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02]
+vol2.T=[2.931499938964844e+02, 2.931514587402241e+02, 2.931510620117051e+02, 2.93150756835917e+02, 2.93150543212877e+02, 2.931503906250114e+02, 2.931502685546875e+02, 2.931502075195312e+02, 2.93150146484375e+02, 2.931501159667969e+02, 2.931500854492188e+02, 2.931500549316406e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931498718260264e+02, 2.931497497560231e+02, 2.931496887207031e+02, 2.931496276854195e+02, 2.931495666503906e+02, 2.931495056152344e+02, 2.931494750975471e+02, 2.931494140625e+02, 2.931493530273983e+02, 2.931493225096747e+02, 2.931492309572495e+02, 2.931491394043696e+02, 2.929998470996076e+02, 2.921370834458679e+02, 2.910178534783285e+02, 2.898335872264078e+02, 2.886855454361641e+02, 2.876335761578069e+02, 2.86709106244642e+02, 2.859233695236852e+02, 2.852741399022806e+02, 2.847507323677238e+02, 2.843379512805158e+02, 2.840188296182599e+02, 2.83776611328125e+02, 2.835989988853422e+02, 2.834717100071754e+02, 2.833805234690407e+02, 2.833151856689999e+02, 2.832683411132012e+02, 2.832348022530788e+02, 2.832107543805616e+02, 2.831935424570406e+02, 2.831811828349169e+02, 2.831723632994396e+02, 2.831660156328579e+02, 2.831614685077511e+02, 2.831582336412685e+02, 2.831558837864432e+02, 2.831542358365696e+02, 2.831530151395199e+02, 2.831521606458045e+02, 2.831515502934053e+02, 2.831511230467659e+02, 2.831507873533337e+02, 2.831505737301413e+02, 2.831504211430147e+02, 2.831502990722656e+02, 2.831502075196768e+02, 2.83150146484375e+02, 2.831501159667969e+02, 2.831500854492188e+02, 2.831500549316406e+02, 2.831500549316406e+02, 2.831500244140625e+02, 2.831500244140625e+02, 2.831500244140625e+02, 2.831500244140625e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02]
+time=[0e+00, 2e+00]
+res1.m_flow=[2.828427076339722e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1.918326655605531e+00, 1.83302447579842e+00, 1.743553649340689e+00, 1.649236240012437e+00, 1.549187544107022e+00, 1.442214634442113e+00, 1.326643856725133e+00, 1.199994260158168e+00, 1.058294707209546e+00, 8.94421170584345e-01, 6.928147297607606e-01, 3.469901214681693e-01, -3.470023106186654e-01, -6.928265910846446e-01, -8.944330319084777e-01, -1.058306508929212e+00, -1.200006061878615e+00, -1.326655777653662e+00, -1.442226436161921e+00, -1.549199345827398e+00, -1.6492480417326e+00, -1.743565451060355e+00, -1.833036277518086e+00, -1.918338457325765e+00, -2.000005960464478e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00]
+res2.m_flow=[-5.456968210637569e-11, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1.918338457325765e+00, 1.833036277518086e+00, 1.743565451060355e+00, 1.6492480417326e+00, 1.549199345827398e+00, 1.442226436161921e+00, 1.326655777653662e+00, 1.200006061878615e+00, 1.058306508929212e+00, 8.944330319084777e-01, 6.928265314804262e-01, 3.470026682471735e-01, -3.469904790966775e-01, -6.928147297607606e-01, -8.944211705841674e-01, -1.058294707209546e+00, -1.199994260158168e+00, -1.326643856725133e+00, -1.442214634442113e+00, -1.549187544107022e+00, -1.649236240012437e+00, -1.743553649340689e+00, -1.83302447579842e+00, -1.918326655605531e+00, -1.999994039535522e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00]
+cheEqu1.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+cheEqu2.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeAdiabaticCooling.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeAdiabaticCooling.txt
new file mode 100644
index 00000000..fbdd098e
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeAdiabaticCooling.txt
@@ -0,0 +1,12 @@
+last-generated=2017-04-14
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "4",
+ "linear": " "
+}
+volExa.T=[2.931499938964844e+02, 2.929415283234184e+02, 2.927331237855087e+02, 2.925247497806886e+02, 2.923164367799927e+02, 2.92108154296875e+02, 2.918999023934083e+02, 2.916917419185302e+02, 2.914835815677797e+02, 2.912754821281488e+02, 2.910674438476562e+02, 2.90859436084742e+02, 2.906514893569833e+02, 2.904435728989488e+02, 2.902357177238882e+02, 2.900278930664062e+02, 2.898201294440806e+02, 2.896124268568378e+02, 2.894047240220685e+02, 2.891971129875964e+02, 2.88989501953125e+02, 2.887819822239688e+02, 2.885744935070835e+02, 2.88367034813229e+02, 2.881596376489326e+02, 2.879522705078125e+02, 2.877449644019942e+02, 2.875376893078648e+02, 2.87330474754708e+02, 2.871233217306728e+02, 2.869161987304688e+02, 2.867091062478428e+02, 2.865020752940474e+02, 2.862950743642285e+02, 2.860881349629491e+02, 2.858812561035156e+02, 2.856743772442276e+02, 2.854675904306206e+02, 2.85260833641645e+02, 2.850541078631942e+02, 2.848474426269531e+02, 2.846408079085812e+02, 2.844342342253654e+02, 2.84227722561744e+02, 2.840212404312626e+02, 2.838147888183594e+02, 2.836083982406124e+02, 2.834020381807346e+02, 2.831957401395779e+02, 2.829895021497215e+02, 2.827832641601562e+02, 2.825771177233253e+02, 2.823710018040725e+02, 2.821649173850896e+02, 2.819588930187167e+02, 2.817528991699219e+02, 2.815469663564289e+02, 2.813410640605139e+02, 2.811352237812829e+02, 2.809294130381024e+02, 2.807236633300781e+02, 2.805179441397775e+02, 2.803122859846331e+02, 2.801066593278669e+02, 2.799010927253113e+02, 2.79695556640625e+02, 2.794900815912404e+02, 2.792846370594339e+02, 2.790792545421286e+02, 2.788739015630564e+02, 2.786686096191406e+02, 2.784633481929484e+02, 2.782581172846254e+02, 2.780529789067809e+02, 2.778478395510467e+02, 2.776427612304688e+02, 2.774377439450471e+02, 2.772327571774945e+02, 2.770278019045367e+02, 2.76822906689573e+02, 2.766180725097656e+02, 2.764132698240977e+02, 2.762084957031855e+02, 2.76003784570252e+02, 2.757991020026562e+02, 2.75594482421875e+02, 2.753899238756679e+02, 2.751853633795488e+02, 2.749808963860762e+02, 2.747764579602696e+02, 2.745720520019531e+02, 2.743677070782109e+02, 2.741633907235899e+02, 2.739591068350039e+02, 2.737549125506954e+02, 2.735507202148438e+02, 2.733465889135663e+02, 2.731425167007345e+02, 2.729384769516093e+02, 2.727344962920939e+02, 2.725305480957031e+02]
+volSim.T=[2.931499938964844e+02, 2.929431762726122e+02, 2.927363891663181e+02, 2.925296325930067e+02, 2.923229065064552e+02, 2.921161804199219e+02, 2.919095154301539e+02, 2.917028808347459e+02, 2.914962463625197e+02, 2.912896728023044e+02, 2.910830993652344e+02, 2.908765869632844e+02, 2.906700745613338e+02, 2.904636229484318e+02, 2.902571715816375e+02, 2.900507507324219e+02, 2.898443604007844e+02, 2.896380005867244e+02, 2.894316710442077e+02, 2.892254027828457e+02, 2.890191040039062e+02, 2.88812866014341e+02, 2.886066590339179e+02, 2.884004820794361e+02, 2.881943361340965e+02, 2.879882202148438e+02, 2.877821042957365e+02, 2.87576049902913e+02, 2.87369995018962e+02, 2.871640016612948e+02, 2.869580078125e+02, 2.867520749988615e+02, 2.865461426762778e+02, 2.863402403803628e+02, 2.861343690927899e+02, 2.859285583496094e+02, 2.857227476064289e+02, 2.855169678715175e+02, 2.85311218163566e+02, 2.851054994637381e+02, 2.848997802734375e+02, 2.846941221184387e+02, 2.844884944810179e+02, 2.842828983412477e+02, 2.840773012215506e+02, 2.838717651367188e+02, 2.836662595696105e+02, 2.834607540025023e+02, 2.832552799330446e+02, 2.830498659185252e+02, 2.828444519042969e+02, 2.826390684076467e+02, 2.824337154288656e+02, 2.822284244637125e+02, 2.820231325199422e+02, 2.8181787109375e+02, 2.816126401851359e+02, 2.814074092768129e+02, 2.812022403816813e+02, 2.80997101025656e+02, 2.807919921875e+02, 2.80586883349344e+02, 2.803818355463441e+02, 2.80176788721234e+02, 2.799718019532449e+02, 2.797668151855469e+02, 2.795618894528596e+02, 2.793569637204633e+02, 2.791520694826617e+02, 2.789472047852761e+02, 2.787423706054688e+02, 2.78537566943385e+02, 2.783327937988793e+02, 2.781280521483863e+02, 2.779233400388914e+02, 2.777186584472656e+02, 2.775139768556399e+02, 2.773093562991704e+02, 2.771047367184078e+02, 2.769001771970945e+02, 2.766956176757812e+02, 2.764911201647304e+02, 2.762866207037676e+02, 2.760821537102949e+02, 2.758777152850704e+02, 2.7567333984375e+02, 2.754689644024296e+02, 2.752646175302305e+02, 2.750603031237753e+02, 2.748559867700275e+02, 2.746517333984375e+02, 2.744475105444257e+02, 2.742432857434122e+02, 2.740391239245566e+02, 2.738349906762775e+02, 2.73630859375e+02, 2.734267585913007e+02, 2.732227168957559e+02, 2.730186771469218e+02, 2.728146659698282e+02, 2.726106872558594e+02]
+time=[0e+00, 1e+01]
+relErr.y=[1e+00, 1.000006079673669e+00, 1.000012040138067e+00, 1.000017881392722e+00, 1.000023722648301e+00, 1.000029563903809e+00, 1.000035285948428e+00, 1.000041007996316e+00, 1.000046610831575e+00, 1.000052213670244e+00, 1.000057816505432e+00, 1.00006330013133e+00, 1.000068664548223e+00, 1.000074028971369e+00, 1.00007939338812e+00, 1.000084638595581e+00, 1.000089764593895e+00, 1.000095009801214e+00, 1.000100016596491e+00, 1.000105023385373e+00, 1.000110030174255e+00, 1.000114917760243e+00, 1.000119805333725e+00, 1.000124692919144e+00, 1.000129342074615e+00, 1.000134110450745e+00, 1.000138759617016e+00, 1.000143289563766e+00, 1.000147819521317e+00, 1.000152349467498e+00, 1.000156760215759e+00, 1.000161051754162e+00, 1.000165343282617e+00, 1.00016963482102e+00, 1.000173807140186e+00, 1.00017786026001e+00, 1.000182032588555e+00, 1.00018596648971e+00, 1.000189900400244e+00, 1.000193834300831e+00, 1.000197649002075e+00, 1.000201463702751e+00, 1.000205159194138e+00, 1.000208854668472e+00, 1.000212430950569e+00, 1.000216007232666e+00, 1.000219464305474e+00, 1.000222921377144e+00, 1.000226259224746e+00, 1.000229597088264e+00, 1.000232815742493e+00, 1.000236034396153e+00, 1.000239133840523e+00, 1.000242233269546e+00, 1.000245213505764e+00, 1.000248193740845e+00, 1.000251054766636e+00, 1.000253915791291e+00, 1.000256657594718e+00, 1.00025939941122e+00, 1.000262022018433e+00, 1.000264644625076e+00, 1.000267148022431e+00, 1.000269651408416e+00, 1.000272035596481e+00, 1.000274419784546e+00, 1.000276684763321e+00, 1.000278949740959e+00, 1.000281095500213e+00, 1.000283122060978e+00, 1.000285267829895e+00, 1.000287175180233e+00, 1.000289082530571e+00, 1.000290989872383e+00, 1.000292778013431e+00, 1.00029456615448e+00, 1.000296235085671e+00, 1.000297784808708e+00, 1.000299334523788e+00, 1.000300884245121e+00, 1.000302314758301e+00, 1.000303626055938e+00, 1.000304937364945e+00, 1.000306129453293e+00, 1.000307321553009e+00, 1.000308394432068e+00, 1.000309467311126e+00, 1.000310420992264e+00, 1.00031137466317e+00, 1.000312209133881e+00, 1.00031304359436e+00, 1.000313758847824e+00, 1.000314474106972e+00, 1.000315070151146e+00, 1.000315546991715e+00, 1.000316023826599e+00, 1.000316381454468e+00, 1.000316739083473e+00, 1.000317096709068e+00, 1.000317215921768e+00, 1.000317454338074e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeHeatReverseFlow.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeHeatReverseFlow.txt
deleted file mode 100644
index b7688784..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeHeatReverseFlow.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-last-generated=2017-01-18
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "2",
- "linear": "0, 0"
-}
-volDyn.ports[1].m_flow=[2., 1.96000003874302031193, 1.91999995827675129512, 1.88000000000000699885, 1.84000003576279036466, 1.79999995231628417969, 1.76000000000000000888, 1.72000002384185779469, 1.67999995231628407311, 1.63999997615814208096, 1.60000002384185791016, 1.55999995231631261028, 1.51999999999994317434, 1.48000000000005682566, 1.44000004768368738972, 1.39999997615814208984, 1.36000002384188634075, 1.32000007152523268772, 1.27999995231634100534, 1.23999999999997156941, 1.20000004768371582031, 1.15999992847431254717, 1.12000002384191477134, 1.08000002384180104897, 1.04000000000011372236, 1., 0.95999994039552571934, 0.92000003576270150685, 0.87999997615808511764, 0.84000001192104267744, 0.80000001192092895508, 0.75999995231617045732, 0.72000004768363046193, 0.67999998807901407272, 0.64000002384197141048, 0.60000002384185791016, 0.55999996423709963445, 0.52000000000005675016, 0.47999997019769191642, 0.44000003576290042107, 0.40000000596046447754, 0.35999997615802853401, 0.31999991655355408682, 0.28000007748598143564, 0.24000003278259712802, 0.20000000298023223877, 0.1599999582767058226, 0.11999992102383175152, 0.08000007450589130542, 0.0400000372529454723, -0., -0.0400000372529454723, -0.08000007450589130542, -0.11999992102383175152, -0.15999995827670615567, -0.20000000298023223877, -0.24000003278259746109, -0.28000007748598110258, -0.31999991655355408682, -0.35999997615802820095, -0.40000000596046447754, -0.44000003576290042107, -0.48000006556533669766, -0.51999990463290934883, -0.55999996423709963445, -0.60000002384185791016, -0.64000002384197185457, -0.68000008344673013028, -0.71999995231605706802, -0.75999995231617023528, -0.80000001192092895508, -0.8400000119210424554, -0.88000007152580084213, -0.91999994039512777988, -0.95999994039552594138, -1., -1.04000000000011350032, -1.08000011920951699551, -1.11999992847419926889, -1.15999992847431276921, -1.20000004768371582031, -1.23999985695203629454, -1.28000004768212405359, -1.31999997615973319043, -1.36000016688982228175, -1.39999997615814208984, -1.43999990463575144872, -1.48000009536583987391, -1.51999990463416012609, -1.56000009536424855128, -1.60000002384185791016, -1.63999983311017771825, -1.68000002384026680957, -1.71999995231787594641, -1.76000014304796370546, -1.79999995231628417969, -1.83999988079389353857, -1.88000007152398196375, -1.91999988079230221594, -1.9600001907316801919, -2.]
-time=[0., 10.]
-gain.y=[20., 19.6000003874301853557, 19.20000077486037426411, 18.79999928474419235158, 18.39999964237209439943, 18., 17.60000047683687540712, 17.20000071525587870269, 16.79999928474412129731, 16.39999952316312459288, 16., 15.60000047683715784785, 15.19999999999886242108, 14.80000000000113580256, 14.39999952316284037579, 14., 13.60000047683715784785, 13.19999999999886242108, 12.80000000000113757892, 12.39999952316284215215, 12., 11.59999999999999964473, 11.19999999999999928946, 10.79999999999999893419, 10.40000000000000035527, 10., 9.59999999999999964473, 9.19999999999999928946, 8.79999999999999893419, 8.40000000000000035527, 8., 7.5999995231628414416, 7.20000000000113615783, 6.79999999999886206581, 6.40000047683715678204, 6., 5.59999952316284321796, 5.20000000000113615783, 4.79999999999886384217, 4.40000047683715678204, 4., 3.59999952316284321796, 3.19999928474198824802, 2.80000071525801175198, 2.40000047683715678204, 2., 1.59999964237156078184, 1.19999928474312866911, 0.80000077486095122481, 0.40000038743047383605, -0., -0.40000038743047383605, -0.80000077486095122481, -1.19999928474312866911, -1.59999964237156433455, -2., -2.40000047683716033475, -2.80000071525800819927, -3.19999928474198824802, -3.59999952316283966525, -4., -4.40000047683715678204, -4.80000095367431711679, -5.19999904632568288321, -5.59999952316284321796, -6., -6.40000047683716033475, -6.80000095367431711679, -7.19999904632568643592, -7.59999952316283966525, -8., -8.39999999999999857891, -8.80000095367431356408, -9.19999904632568288321, -9.60000000000000142109, -10., -10.39999999999999857891, -10.80000095367431711679, -11.19999904632568643592, -11.60000000000000142109, -12., -12.39999809268775265991, -12.80000095365612367004, -13.19999904634386922453, -13.60000190731225444551, -14., -14.39999809268774555449, -14.80000095365612367004, -15.19999904634387632996, -15.60000190731225444551, -16., -16.39999809268774555449, -16.79999999998181436922, -17.20000000001819273621, -17.60000190731224734009, -18., -18.39999809268774555449, -18.79999999998180726379, -19.20000000001819273621, -19.60000190731225444551, -20.]
-volSte.T=[313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 313.15985107421875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875, 303.14013671875]
-volDyn.T=[293.149993896484375, 296.19363399114126877976, 298.72625725413308828138, 300.83984351576884819224, 302.6088255854502335751, 304.093597412109375, 305.34344454620497799624, 306.3984986487701007718, 307.29159535943131231761, 308.0497132986198494109, 308.695068359375, 309.24584948615654411697, 309.71725442752466506136, 310.12176531272331203581, 310.46981819104991018321, 310.77001953125, 311.02963250996975830276, 311.25469960567767202519, 311.45031746859558552387, 311.62072757646097898032, 311.769500732421875, 311.89971935295045568637, 312.01391596396564409588, 312.1142883743887637138, 312.20269767372514024828, 312.280670166015625, 312.34963995355070665028, 312.41067502110672648996, 312.46481325643253512681, 312.51287837431294747148, 312.55560302734375, 312.59362796359351932551, 312.62750242598121985793, 312.65765382205427158624, 312.68453977047465741634, 312.708465576171875, 312.72976686462061479688, 312.74868773555499501526, 312.76547241953085176647, 312.7803039416903629899, 312.793365478515625, 312.80477906277519650757, 312.81469728308729827404, 312.8232116547878831625, 312.83044432953465729952, 312.83642578125, 312.84124756252276711166, 312.84494019136764109135, 312.84756469290005043149, 312.84912109258584678173, 312.849609375, 312.83343502483324982677, 312.7850950862047056944, 312.70507830136938309806, 312.59411632837156957976, 312.453369140625, 312.2841795105485402928, 312.08819539769280027031, 311.86727949220261280061, 311.62347436178265525086, 311.359039306640625, 311.07635470150825085511, 310.7778924811276510809, 310.46618712676047380228, 310.14382965653231849501, 309.8133544921875, 309.47732511683688017001, 309.13821346289415714637, 308.7983099740237662445, 308.45993074166500491629, 308.125152587890625, 307.79589812739840226641, 307.47390686621599797945, 307.16076719149771179218, 306.85784940572949608395, 306.5662841796875, 306.28710911612120071368, 306.02105663676002222928, 305.76870774600001823273, 305.53048728231829045399, 305.306610107421875, 305.09719926338260620469, 304.90212977102140712304, 304.72122225822346308632, 304.55416809466191807587, 304.400543212890625, 304.2598882127667820896, 304.13162208337399761149, 304.0151064147891020184, 303.90972862614717087126, 303.814788818359375, 303.72958405105617885056, 303.65344224719177645966, 303.58563244761614896561, 303.52551248227734959073, 303.472381591796875, 303.42562883148980290571, 303.38464348251164892645, 303.34884650015590068506, 303.31768787885334859311, 303.290679931640625]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeHeatReverseFlowPrescribedHeatFlowRate.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeHeatReverseFlowPrescribedHeatFlowRate.txt
deleted file mode 100644
index be7d1e5f..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeHeatReverseFlowPrescribedHeatFlowRate.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-last-generated=2017-03-31
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "2",
- "linear": "0"
-}
-volDyn.ports[1].m_flow=[2e+00, 1.96000003874302e+00, 1.919999958276751e+00, 1.880000000000007e+00, 1.84000003576279e+00, 1.799999952316284e+00, 1.76e+00, 1.720000023841858e+00, 1.679999952316284e+00, 1.639999976158142e+00, 1.600000023841858e+00, 1.559999952316313e+00, 1.519999999999943e+00, 1.480000000000057e+00, 1.440000047683687e+00, 1.399999976158142e+00, 1.360000023841886e+00, 1.320000071525233e+00, 1.279999952316341e+00, 1.239999999999972e+00, 1.200000047683716e+00, 1.159999928474313e+00, 1.120000023841915e+00, 1.080000023841801e+00, 1.040000000000114e+00, 1e+00, 9.599999403955257e-01, 9.200000357627015e-01, 8.799999761580851e-01, 8.400000119210427e-01, 8.00000011920929e-01, 7.599999523161705e-01, 7.200000476836305e-01, 6.799999880790141e-01, 6.400000238419714e-01, 6.000000238418579e-01, 5.599999642370996e-01, 5.200000000000568e-01, 4.799999701976919e-01, 4.400000357629004e-01, 4.000000059604645e-01, 3.599999761580285e-01, 3.199999165535541e-01, 2.800000774859814e-01, 2.400000327825971e-01, 2.000000029802322e-01, 1.599999582767058e-01, 1.199999210238318e-01, 8.000007450589131e-02, 4.000003725294547e-02, -0e+00, -4.000003725294547e-02, -8.000007450589131e-02, -1.199999210238318e-01, -1.599999582767062e-01, -2.000000029802322e-01, -2.400000327825975e-01, -2.800000774859811e-01, -3.199999165535541e-01, -3.599999761580282e-01, -4.000000059604645e-01, -4.400000357629004e-01, -4.800000655653367e-01, -5.199999046329093e-01, -5.599999642370996e-01, -6.000000238418579e-01, -6.400000238419719e-01, -6.800000834467301e-01, -7.199999523160571e-01, -7.599999523161702e-01, -8.00000011920929e-01, -8.400000119210425e-01, -8.800000715258008e-01, -9.199999403951278e-01, -9.599999403955259e-01, -1e+00, -1.040000000000114e+00, -1.080000119209517e+00, -1.119999928474199e+00, -1.159999928474313e+00, -1.200000047683716e+00, -1.239999856952036e+00, -1.280000047682124e+00, -1.319999976159733e+00, -1.360000166889822e+00, -1.399999976158142e+00, -1.439999904635751e+00, -1.48000009536584e+00, -1.51999990463416e+00, -1.560000095364249e+00, -1.600000023841858e+00, -1.639999833110178e+00, -1.680000023840267e+00, -1.719999952317876e+00, -1.760000143047964e+00, -1.799999952316284e+00, -1.839999880793894e+00, -1.880000071523982e+00, -1.919999880792302e+00, -1.96000019073168e+00, -2e+00]
-time=[0e+00, 1e+01]
-gain.y=[2e+01, 1.960000038743019e+01, 1.920000077486037e+01, 1.879999928474419e+01, 1.839999964237209e+01, 1.8e+01, 1.760000047683688e+01, 1.720000071525588e+01, 1.679999928474412e+01, 1.639999952316312e+01, 1.6e+01, 1.560000047683716e+01, 1.519999999999886e+01, 1.480000000000114e+01, 1.439999952316284e+01, 1.4e+01, 1.360000047683716e+01, 1.319999999999886e+01, 1.280000000000114e+01, 1.239999952316284e+01, 1.2e+01, 1.16e+01, 1.12e+01, 1.08e+01, 1.04e+01, 1e+01, 9.6e+00, 9.199999999999999e+00, 8.799999999999999e+00, 8.4e+00, 8e+00, 7.599999523162841e+00, 7.200000000001136e+00, 6.799999999998862e+00, 6.400000476837157e+00, 6e+00, 5.599999523162843e+00, 5.200000000001136e+00, 4.799999999998864e+00, 4.400000476837157e+00, 4e+00, 3.599999523162843e+00, 3.199999284741988e+00, 2.800000715258012e+00, 2.400000476837157e+00, 2e+00, 1.599999642371561e+00, 1.199999284743129e+00, 8.000007748609512e-01, 4.000003874304738e-01, -0e+00, -4.000003874304738e-01, -8.000007748609512e-01, -1.199999284743129e+00, -1.599999642371564e+00, -2e+00, -2.40000047683716e+00, -2.800000715258008e+00, -3.199999284741988e+00, -3.59999952316284e+00, -4e+00, -4.400000476837157e+00, -4.800000953674317e+00, -5.199999046325683e+00, -5.599999523162843e+00, -6e+00, -6.40000047683716e+00, -6.800000953674317e+00, -7.199999046325686e+00, -7.59999952316284e+00, -8e+00, -8.399999999999999e+00, -8.800000953674314e+00, -9.199999046325683e+00, -9.600000000000001e+00, -1e+01, -1.04e+01, -1.080000095367432e+01, -1.119999904632569e+01, -1.16e+01, -1.2e+01, -1.239999809268775e+01, -1.280000095365612e+01, -1.319999904634387e+01, -1.360000190731225e+01, -1.4e+01, -1.439999809268775e+01, -1.480000095365612e+01, -1.519999904634388e+01, -1.560000190731225e+01, -1.6e+01, -1.639999809268775e+01, -1.679999999998181e+01, -1.720000000001819e+01, -1.760000190731225e+01, -1.8e+01, -1.839999809268775e+01, -1.879999999998181e+01, -1.920000000001819e+01, -1.960000190731225e+01, -2e+01]
-volSte.T=[3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.131598510742188e+02, 3.081499938964844e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02, 3.0314013671875e+02]
-volDyn.T=[2.931499938964844e+02, 2.9619381709661e+02, 2.987264098420237e+02, 3.008399961036595e+02, 3.026089476557718e+02, 3.0409375e+02, 3.053435360989757e+02, 3.063985596839445e+02, 3.072916563945876e+02, 3.080497743337761e+02, 3.086950988769531e+02, 3.092459105213128e+02, 3.097172849451755e+02, 3.101217958303014e+02, 3.10469848708628e+02, 3.107700500488281e+02, 3.110296630275479e+02, 3.112547301232558e+02, 3.11450347986101e+02, 3.11620727576461e+02, 3.117695007324219e+02, 3.118996888353723e+02, 3.120138854463875e+02, 3.121142273392325e+02, 3.122026061211363e+02, 3.122806091308594e+02, 3.123495484008163e+02, 3.124105834683724e+02, 3.124647217036982e+02, 3.125127868215786e+02, 3.125555114746094e+02, 3.125935364108591e+02, 3.126274108732468e+02, 3.126575622693199e+02, 3.126844482177403e+02, 3.127083740234375e+02, 3.127296753118862e+02, 3.12748626700326e+02, 3.127653808668692e+02, 3.127802429063886e+02, 3.127932739257812e+02, 3.128047180276189e+02, 3.1281463624764e+02, 3.128231506196316e+02, 3.128303832943784e+02, 3.128363342285156e+02, 3.128411560097884e+02, 3.128448486386333e+02, 3.128474426228786e+02, 3.128489990224189e+02, 3.128491821289062e+02, 3.12832763637969e+02, 3.127844847346422e+02, 3.127045595025413e+02, 3.125937806347212e+02, 3.124531555175781e+02, 3.122840574403816e+02, 3.120881953982749e+02, 3.118674015625151e+02, 3.116236879848295e+02, 3.113592529296875e+02, 3.110765683245551e+02, 3.107781061041745e+02, 3.104664007500984e+02, 3.101440432795792e+02, 3.098135375976562e+02, 3.094774777047275e+02, 3.091383050156285e+02, 3.0879837100918e+02, 3.084599612592431e+02, 3.081251525878906e+02, 3.077958676098203e+02, 3.074738763486379e+02, 3.071607366736285e+02, 3.068577883707188e+02, 3.065662536621094e+02, 3.062870480811105e+02, 3.060209956018948e+02, 3.057686772284219e+02, 3.055304567647402e+02, 3.053066101074219e+02, 3.050971687458045e+02, 3.049020992537343e+02, 3.047211917406453e+02, 3.045541680946619e+02, 3.044005432128906e+02, 3.042598882127668e+02, 3.04131622083374e+02, 3.040151064147891e+02, 3.039097286261472e+02, 3.038147583007812e+02, 3.037295535334781e+02, 3.036533812123265e+02, 3.035855714124599e+02, 3.03525420929543e+02, 3.034722900390625e+02, 3.034255067611773e+02, 3.033844908949121e+02, 3.033486939122653e+02, 3.033175658085408e+02, 3.032905883789062e+02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeInitialization.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeInitialization.txt
new file mode 100644
index 00000000..4ab2fea7
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeInitialization.txt
@@ -0,0 +1,8 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'number of continuous time states': '3', 'linear': ' '}
+vol1.T=[293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375]
+vol1.T_start=[293.149993896484375, 293.149993896484375]
+time=[0., 0.00100000004749745131]
+vol1.ports[2].h_outflow=[45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125]
+vol1.ports[1].h_outflow=[45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125, 45300.9453125]
+pipe1.port_b.h_outflow=[45300.9453125, 45300.9453125]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeMFactor.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeMFactor.txt
new file mode 100644
index 00000000..5ac17d4f
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeMFactor.txt
@@ -0,0 +1,8 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'number of continuous time states': '6', 'linear': '0, 0'}
+vol1.T=[293.149993896484375, 293.701934814453125, 294.209075927734375, 294.675140380859375, 295.10345458984375, 295.497100830078125, 295.858978271484375, 296.191619873046875, 296.4974365234375, 296.778594970703125, 297.037109375, 297.274810791015625, 297.493377685546875, 297.694366455078125, 297.879180908203125, 298.049163818359375, 298.20550537109375, 298.34930419921875, 298.4815673828125, 298.603179931640625, 298.715057373046875, 298.817962646484375, 298.91259765625, 298.999664306640625, 299.079742431640625, 299.153411865234375, 299.221160888671875, 299.28350830078125, 299.340850830078125, 299.393585205078125, 299.442108154296875, 299.486724853515625, 299.527801513671875, 299.5655517578125, 299.60028076171875, 299.63226318359375, 299.661651611328125, 299.688690185546875, 299.713592529296875, 299.736480712890625, 299.757537841796875, 299.77691650390625, 299.794769287109375, 299.811187744140625, 299.826263427734375, 299.840179443359375, 299.852935791015625, 299.864715576171875, 299.875518798828125, 299.885467529296875, 299.894622802734375, 299.903045654296875, 299.910797119140625, 299.917938232421875, 299.92449951171875, 299.9305419921875, 299.93609619140625, 299.941192626953125, 299.945892333984375, 299.950225830078125, 299.954193115234375, 299.957855224609375, 299.96124267578125, 299.964324951171875, 299.967193603515625, 299.969818115234375, 299.97222900390625, 299.974456787109375, 299.97650146484375, 299.978363037109375, 299.9801025390625, 299.981689453125, 299.983154296875, 299.9844970703125, 299.985748291015625, 299.98687744140625, 299.9879150390625, 299.9888916015625, 299.989776611328125, 299.9906005859375, 299.991363525390625, 299.992034912109375, 299.99267578125, 299.993255615234375, 299.993804931640625, 299.994293212890625, 299.9947509765625, 299.995147705078125, 299.99554443359375, 299.995880126953125, 299.996185302734375, 299.996490478515625, 299.99676513671875, 299.99700927734375, 299.99725341796875, 299.997467041015625, 299.997650146484375, 299.997833251953125, 299.99798583984375, 299.998138427734375, 299.998291015625]
+volMFactor.T=[293.149993896484375, 293.70196533203125, 294.209320068359375, 294.67572021484375, 295.104522705078125, 295.498779296875, 295.861297607421875, 296.194610595703125, 296.501068115234375, 296.782867431640625, 297.041961669921875, 297.28021240234375, 297.499237060546875, 297.700653076171875, 297.885833740234375, 298.05609130859375, 298.212677001953125, 298.35662841796875, 298.489013671875, 298.6107177734375, 298.722625732421875, 298.82550048828125, 298.92010498046875, 299.007080078125, 299.087066650390625, 299.16058349609375, 299.22821044921875, 299.290374755859375, 299.3475341796875, 299.400054931640625, 299.4483642578125, 299.4927978515625, 299.53363037109375, 299.571197509765625, 299.605712890625, 299.637451171875, 299.6666259765625, 299.693450927734375, 299.7181396484375, 299.740814208984375, 299.761688232421875, 299.780853271484375, 299.79852294921875, 299.814727783203125, 299.82965087890625, 299.8433837890625, 299.855987548828125, 299.867584228515625, 299.87823486328125, 299.8880615234375, 299.897064208984375, 299.905364990234375, 299.9129638671875, 299.91998291015625, 299.926422119140625, 299.932342529296875, 299.93780517578125, 299.94281005859375, 299.947418212890625, 299.95166015625, 299.955535888671875, 299.959136962890625, 299.96240234375, 299.9654541015625, 299.968231201171875, 299.970794677734375, 299.97314453125, 299.975311279296875, 299.977294921875, 299.9791259765625, 299.980804443359375, 299.982330322265625, 299.9837646484375, 299.985076904296875, 299.98626708984375, 299.98736572265625, 299.9884033203125, 299.98931884765625, 299.990203857421875, 299.990966796875, 299.99169921875, 299.99237060546875, 299.99298095703125, 299.993560791015625, 299.99407958984375, 299.994537353515625, 299.994964599609375, 299.995361328125, 299.9957275390625, 299.996063232421875, 299.996368408203125, 299.996673583984375, 299.996917724609375, 299.997161865234375, 299.99737548828125, 299.997589111328125, 299.997772216796875, 299.9979248046875, 299.998077392578125, 299.99822998046875, 299.998382568359375]
+time=[0., 100.]
+volMFactor.Xi[1]=[0.00999999977648258209, 0.01565663889050483704, 0.01810755208134651184, 0.0191776081919670105, 0.01964517123997211456, 0.01984189637005329132, 0.01992865093052387238, 0.0199683215469121933, 0.01998667977750301361, 0.01999597251415252686, 0.01999939605593681335, 0.02000010199844837189, 0.02000001817941665649, 0.01999999582767486572, 0.02000010013580322266, 0.02000042609870433807, 0.0200008004903793335, 0.02000089734792709351, 0.02000059187412261963, 0.02000031061470508575, 0.0200000423938035965, 0.01999993063509464264, 0.01999989710748195648, 0.01999994181096553802, 0.0200000125914812088, 0.02000003866851329803, 0.02000005170702934265, 0.02000002562999725342, 0.01999999955296516418, 0.01999997347593307495, 0.01999994181096553802, 0.01999988965690135956, 0.01999980397522449493, 0.01999978348612785339, 0.01999980956315994263, 0.0199999101459980011, 0.02000003308057785034, 0.02000013180077075958, 0.02000017650425434113, 0.02000012248754501343, 0.02000011131167411804, 0.02000008150935173035, 0.02000004611909389496, 0.02000000514090061188, 0.01999995112419128418, 0.01999992132186889648, 0.01999993808567523956, 0.01999993994832038879, 0.01999995671212673187, 0.01999997720122337341, 0.01999999955296516418, 0.02000003121793270111, 0.02000004984438419342, 0.0200000423938035965, 0.0200000368058681488, 0.02000002562999725342, 0.0200000125914812088, 0.01999999955296516418, 0.01999998278915882111, 0.01999996975064277649, 0.01999997161328792572, 0.01999997906386852264, 0.01999998465180397034, 0.01999999396502971649, 0.01999999955296516418, 0.02000001072883605957, 0.02000001817941665649, 0.02000001817941665649, 0.0200000125914812088, 0.02000000886619091034, 0.02000000327825546265, 0.01999999955296516418, 0.01999999396502971649, 0.01999999023973941803, 0.0199999883770942688, 0.01999999210238456726, 0.01999999396502971649, 0.01999999769032001495, 0.01999999955296516418, 0.02000000514090061188, 0.02000001072883605957, 0.02000001817941665649, 0.02000002562999725342, 0.02000003308057785034, 0.02000004053115844727, 0.02000004611909389496, 0.02000005170702934265, 0.02000005356967449188, 0.02000005543231964111, 0.02000005356967449188, 0.02000004798173904419, 0.02000003866851329803, 0.02000002562999725342, 0.0200000125914812088, 0.01999999955296516418, 0.0199999883770942688, 0.01999997720122337341, 0.01999997161328792572, 0.01999996975064277649, 0.01999997533857822418, 0.0199999883770942688]
+vol1.Xi[1]=[0.00999999977648258209, 0.0107995644211769104, 0.01153518911451101303, 0.01221199706196784973, 0.01283469051122665405, 0.01340758800506591797, 0.01393467839807271957, 0.01441962830722332001, 0.01486581191420555115, 0.01527632679790258408, 0.01565401814877986908, 0.01600150763988494873, 0.0163212120532989502, 0.01661535352468490601, 0.01688597910106182098, 0.01713497750461101532, 0.01736407913267612457, 0.01757486723363399506, 0.01776879467070102692, 0.01794721744954586029, 0.0181113705039024353, 0.01826239190995693207, 0.018401341512799263, 0.01852917484939098358, 0.01864679157733917236, 0.01875499822199344635, 0.018854556605219841, 0.01894614659249782562, 0.01903041265904903412, 0.01910793595016002655, 0.01917925290763378143, 0.01924486830830574036, 0.01930524036288261414, 0.01936077140271663666, 0.01941186189651489258, 0.01945886574685573578, 0.01950210891664028168, 0.01954189315438270569, 0.01957849971950054169, 0.01961219124495983124, 0.01964318007230758667, 0.01967169530689716339, 0.01969793997704982758, 0.01972208917140960693, 0.01974430494010448456, 0.01976474747061729431, 0.01978356204926967621, 0.0198008660227060318, 0.01981678418815135956, 0.01983143389225006104, 0.01984491199254989624, 0.01985730603337287903, 0.01986871100962162018, 0.01987920701503753662, 0.0198888629674911499, 0.01989774405956268311, 0.01990591734647750854, 0.01991344243288040161, 0.01992036215960979462, 0.01992673054337501526, 0.01993259042501449585, 0.01993798092007637024, 0.01994294114410877228, 0.01994750462472438812, 0.0199517030268907547, 0.01995556429028511047, 0.01995911635458469391, 0.01996238343417644501, 0.01996538974344730377, 0.01996815577149391174, 0.01997070014476776123, 0.01997304335236549377, 0.01997519657015800476, 0.01997718028724193573, 0.01997900567948818207, 0.01998068392276763916, 0.01998222991824150085, 0.01998365111649036407, 0.01998495869338512421, 0.0199861619621515274, 0.01998726651072502136, 0.01998828351497650146, 0.01998921670019626617, 0.01999007537961006165, 0.01999086327850818634, 0.01999158971011638641, 0.01999225281178951263, 0.01999286189675331116, 0.01999342069029808044, 0.01999393291771411896, 0.01999440416693687439, 0.0199948381632566452, 0.01999524049460887909, 0.01999560743570327759, 0.01999594271183013916, 0.01999624818563461304, 0.01999653130769729614, 0.01999679207801818848, 0.0199970342218875885, 0.01999726146459579468, 0.01999747566878795624]
+vol.T=[293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeMassFlow.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeMassFlow.txt
new file mode 100644
index 00000000..d4e8446b
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeMassFlow.txt
@@ -0,0 +1,4 @@
+last-generated=2015-06-05
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'number of continuous time states': '2', 'linear': ' '}
+vol.T=[293.149993896484375, 293.96624754663162093493, 294.74914548487049614778, 295.5000914646953447118, 296.22039790699091099668, 296.911285400390625, 297.57397445399726620963, 298.20962531804599393581, 298.81933586603207686494, 299.40417494067486359199, 299.96514892578125, 300.50323473711603128322, 301.01934790253409346406, 301.51440452715792162053, 301.98928844049089548207, 302.44476318359375, 302.88165272958565310546, 303.30068950081573575517, 303.70266742324656661367, 304.08822640799922965016, 304.458038330078125, 304.81274447051725928759, 305.1530149771568289907, 305.47937026896414636212, 305.79241913993581647446, 306.092681884765625, 306.38067653743223672791, 306.65695177471195620456, 306.92193615833832609496, 307.17611670485325703339, 307.419891357421875, 307.65374777614511003776, 307.87805165260203921207, 308.09320078363828088186, 308.29956035333435693246, 308.497528076171875, 308.68737810634792140263, 308.86950675051770076607, 309.04418953439750339385, 309.21176131744852000338, 309.372467041015625, 309.52664198903960368625, 309.67449978675023203323, 309.81631443125638725178, 309.95236193307198391267, 310.082855224609375, 310.20803844649356051377, 310.32809470593952028139, 310.44326760631497563736, 310.55371083403576903947, 310.65966796875, 310.76132211592641851894, 310.85879534733265927571, 310.95230084989435681564, 311.04199210338987313662, 311.128021240234375, 311.21054084817302509691, 311.28967299882799579791, 311.36560044361965537973, 311.43841545909521073554, 311.508270263671875, 311.57525641008402317311, 311.63952648680435686401, 311.70117175945767939993, 311.7603148859633961365, 311.8170166015625, 311.87142949385457768585, 311.92358408158190741233, 311.97363271878555224248, 312.02163691792515010093, 312.06768798828125, 312.11187748244270778741, 312.15423591871518738117, 312.19488517765415735994, 312.23385616464651093338, 312.271240234375, 312.30709842199581771638, 312.34149176324723384823, 312.37448113947169758831, 312.40612790014711208642, 312.436492919921875, 312.46560658060730020225, 312.49356084281924950119, 312.5203246569737984828, 312.54602060385292361389, 312.5706787109375, 312.59432974492870016547, 312.61700443673083782414, 312.63876338669894039413, 312.65960701159025347806, 312.67962646484375, 312.69882194930852392645, 312.71722415543547413108, 312.73489376565049724377, 312.75183111813237246679, 312.768096923828125, 312.78366083046552148517, 312.79861452989217696086, 312.81295773689697625741, 312.82672124262779789206, 312.83990478515625]
+time=[0., 10.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeMoistureReverseFlow.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeMoistureReverseFlow.txt
deleted file mode 100644
index 773c00df..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeMoistureReverseFlow.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-last-generated=2017-03-31
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "2",
- "linear": "0, 0"
-}
-volDyn.ports[1].m_flow=[2e+00, 1.96000003874302e+00, 1.919999958276751e+00, 1.880000000000007e+00, 1.84000003576279e+00, 1.799999952316284e+00, 1.76e+00, 1.720000023841858e+00, 1.679999952316284e+00, 1.639999976158142e+00, 1.600000023841858e+00, 1.559999952316313e+00, 1.519999999999943e+00, 1.480000000000057e+00, 1.440000047683687e+00, 1.399999976158142e+00, 1.360000023841886e+00, 1.320000071525233e+00, 1.279999952316341e+00, 1.239999999999972e+00, 1.200000047683716e+00, 1.159999928474313e+00, 1.120000023841915e+00, 1.080000023841801e+00, 1.040000000000114e+00, 1e+00, 9.599999403955257e-01, 9.200000357627015e-01, 8.799999761580851e-01, 8.400000119210427e-01, 8.00000011920929e-01, 7.599999523161705e-01, 7.200000476836305e-01, 6.799999880790141e-01, 6.400000238419714e-01, 6.000000238418579e-01, 5.599999642370996e-01, 5.200000000000568e-01, 4.799999701976919e-01, 4.400000357629004e-01, 4.000000059604645e-01, 3.599999761580285e-01, 3.199999165535541e-01, 2.800000774859814e-01, 2.400000327825971e-01, 2.000000029802322e-01, 1.599999582767058e-01, 1.199999210238318e-01, 8.000007450589131e-02, 4.000003725294547e-02, -0e+00, -4.000003725294547e-02, -8.000007450589131e-02, -1.199999210238318e-01, -1.599999582767062e-01, -2.000000029802322e-01, -2.400000327825975e-01, -2.800000774859811e-01, -3.199999165535541e-01, -3.599999761580282e-01, -4.000000059604645e-01, -4.400000357629004e-01, -4.800000655653367e-01, -5.199999046329093e-01, -5.599999642370996e-01, -6.000000238418579e-01, -6.400000238419719e-01, -6.800000834467301e-01, -7.199999523160571e-01, -7.599999523161702e-01, -8.00000011920929e-01, -8.400000119210425e-01, -8.800000715258008e-01, -9.199999403951278e-01, -9.599999403955259e-01, -1e+00, -1.040000000000114e+00, -1.080000119209517e+00, -1.119999928474199e+00, -1.159999928474313e+00, -1.200000047683716e+00, -1.239999856952036e+00, -1.280000047682124e+00, -1.319999976159733e+00, -1.360000166889822e+00, -1.399999976158142e+00, -1.439999904635751e+00, -1.48000009536584e+00, -1.51999990463416e+00, -1.560000095364249e+00, -1.600000023841858e+00, -1.639999833110178e+00, -1.680000023840267e+00, -1.719999952317876e+00, -1.760000143047964e+00, -1.799999952316284e+00, -1.839999880793894e+00, -1.880000071523982e+00, -1.919999880792302e+00, -1.96000019073168e+00, -2e+00]
-time=[0e+00, 1e+01]
-gain.y=[9.999999776482582e-03, 9.800000119209312e-03, 9.600000461935905e-03, 9.39999988824146e-03, 9.200000216066644e-03, 8.999999612569809e-03, 8.800000000000266e-03, 8.600000268220769e-03, 8.399999724328651e-03, 8.199999992549153e-03, 8.00000037997961e-03, 7.799999836087635e-03, 7.600000223516557e-03, 7.399999906868604e-03, 7.199999828636792e-03, 7.000000216066837e-03, 6.800000137835594e-03, 6.600000059603783e-03, 6.399999742955831e-03, 6.200000130384752e-03, 6.000000052154064e-03, 5.799999735504975e-03, 5.599999895692688e-03, 5.400000044702666e-03, 5.20000020489038e-03, 4.999999888241291e-03, 4.800000037251268e-03, 4.600000197440092e-03, 4.399999880791003e-03, 4.200000040979828e-03, 4.000000189989805e-03, 3.799999873339606e-03, 3.600000033527874e-03, 3.399999949708318e-03, 3.200000109896587e-03, 3.000000026077032e-03, 2.799999709427944e-03, 2.600000102445745e-03, 2.40000001862619e-03, 2.200000178814458e-03, 2.000000094994903e-03, 1.799999778345259e-03, 1.599999578110936e-03, 1.400000331551885e-03, 1.200000247731773e-03, 1.000000047497451e-03, 7.999997890554668e-04, 5.999996470282527e-04, 4.0000037136537e-04, 2.000001856826147e-04, -0e+00, -2.000001856826147e-04, -4.000003713653699e-04, -5.999996470282527e-04, -7.999997890554687e-04, -1.000000047497451e-03, -1.200000247731775e-03, -1.400000331551883e-03, -1.599999578110936e-03, -1.799999778345257e-03, -2.000000094994903e-03, -2.200000178814458e-03, -2.400000495462438e-03, -2.599999625607276e-03, -2.799999709427944e-03, -3.000000026077032e-03, -3.200000109896589e-03, -3.400000426544567e-03, -3.599999556691628e-03, -3.799999873339605e-03, -4.000000189989805e-03, -4.200000040979827e-03, -4.400000357626695e-03, -4.599999720599959e-03, -4.800000037251269e-03, -4.999999888241291e-03, -5.20000020489038e-03, -5.40000052153947e-03, -5.599999418855887e-03, -5.799999735504976e-03, -6.000000052154064e-03, -6.199999415141079e-03, -6.4000002197863e-03, -6.599999582777752e-03, -6.800000853070945e-03, -7.000000216066837e-03, -7.199999113401442e-03, -7.400000383694632e-03, -7.599999746686088e-03, -7.800000551331312e-03, -8.00000037997961e-03, -8.199999277305334e-03, -8.400000081950562e-03, -8.599999910598861e-03, -8.800000715244082e-03, -8.999999612569809e-03, -9.199999441218108e-03, -9.400000245863332e-03, -9.600000074511634e-03, -9.800000879156858e-03, -9.999999776482582e-03]
-volSte.Xi[1]=[1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03]
-volDyn.Xi[1]=[9.999999776482582e-03, 1.076057272843535e-02, 1.139341479278666e-02, 1.19215510200276e-02, 1.23635716491088e-02, 1.273458451032639e-02, 1.304688297716053e-02, 1.331050789960336e-02, 1.353367229298468e-02, 1.372310895841858e-02, 1.388435903936625e-02, 1.40219926526208e-02, 1.413978444724089e-02, 1.424086191432861e-02, 1.432782599734874e-02, 1.440284121781588e-02, 1.446771247716015e-02, 1.452395224274218e-02, 1.457282902953405e-02, 1.461540722291566e-02, 1.465258188545704e-02, 1.468511301163658e-02, 1.471364403715424e-02, 1.473872085277473e-02, 1.476080527390254e-02, 1.478029321879148e-02, 1.479752083903564e-02, 1.481277494929855e-02, 1.482630055997936e-02, 1.483831181030214e-02, 1.484899036586285e-02, 1.48584917272201e-02, 1.486695371183177e-02, 1.48744927752742e-02, 1.488120853289398e-02, 1.488718949258327e-02, 1.489251200582232e-02, 1.489724125498171e-02, 1.490143500454089e-02, 1.490514073185167e-02, 1.490840315818787e-02, 1.49112585957063e-02, 1.491373777821181e-02, 1.491586677349943e-02, 1.491766888488399e-02, 1.491916179656982e-02, 1.492036320367252e-02, 1.492128428216511e-02, 1.492193620548043e-02, 1.492232363643975e-02, 1.492225285619497e-02, 1.490579914558584e-02, 1.485635140792661e-02, 1.477454620756386e-02, 1.466119487653128e-02, 1.451738923788071e-02, 1.434452720532669e-02, 1.414426654379458e-02, 1.391850829331752e-02, 1.366936440034229e-02, 1.339911576360464e-02, 1.311019313876356e-02, 1.280515208634135e-02, 1.24865813760208e-02, 1.215712478495353e-02, 1.181940082460642e-02, 1.147598274611429e-02, 1.112939630494595e-02, 1.078205808145035e-02, 1.043624743161363e-02, 1.009411830455065e-02, 9.757646042618671e-03, 9.428615995474256e-03, 9.108628749122126e-03, 8.799073577299863e-03, 8.501149713993073e-03, 8.215849954621849e-03, 7.943969648562773e-03, 7.686108366014923e-03, 7.442677154477766e-03, 7.213915232568979e-03, 6.999900427135531e-03, 6.800559451460737e-03, 6.615694488286647e-03, 6.444983496187684e-03, 6.288010161370039e-03, 6.144269432513008e-03, 6.013186878103557e-03, 5.894136833286879e-03, 5.786444140207743e-03, 5.689418409019709e-03, 5.602343791215439e-03, 5.524503859976775e-03, 5.455203945991863e-03, 5.393730724419054e-03, 5.339412018656731e-03, 5.291623701926746e-03, 5.249711145530877e-03, 5.21311543029883e-03, 5.181298479830394e-03, 5.153735633939505e-03]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeMoistureReverseFlowPrescribedHeatFlowRate.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeMoistureReverseFlowPrescribedHeatFlowRate.txt
deleted file mode 100644
index 6f1ee3fa..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeMoistureReverseFlowPrescribedHeatFlowRate.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-last-generated=2017-03-31
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "2",
- "linear": " "
-}
-volDyn.ports[1].m_flow=[2e+00, 1.96000003874302e+00, 1.919999958276751e+00, 1.880000000000007e+00, 1.84000003576279e+00, 1.799999952316284e+00, 1.76e+00, 1.720000023841858e+00, 1.679999952316284e+00, 1.639999976158142e+00, 1.600000023841858e+00, 1.559999952316313e+00, 1.519999999999943e+00, 1.480000000000057e+00, 1.440000047683687e+00, 1.399999976158142e+00, 1.360000023841886e+00, 1.320000071525233e+00, 1.279999952316341e+00, 1.239999999999972e+00, 1.200000047683716e+00, 1.159999928474313e+00, 1.120000023841915e+00, 1.080000023841801e+00, 1.040000000000114e+00, 1e+00, 9.599999403955257e-01, 9.200000357627015e-01, 8.799999761580851e-01, 8.400000119210427e-01, 8.00000011920929e-01, 7.599999523161705e-01, 7.200000476836305e-01, 6.799999880790141e-01, 6.400000238419714e-01, 6.000000238418579e-01, 5.599999642370996e-01, 5.200000000000568e-01, 4.799999701976919e-01, 4.400000357629004e-01, 4.000000059604645e-01, 3.599999761580285e-01, 3.199999165535541e-01, 2.800000774859814e-01, 2.400000327825971e-01, 2.000000029802322e-01, 1.599999582767058e-01, 1.199999210238318e-01, 8.000007450589131e-02, 4.000003725294547e-02, -0e+00, -4.000003725294547e-02, -8.000007450589131e-02, -1.199999210238318e-01, -1.599999582767062e-01, -2.000000029802322e-01, -2.400000327825975e-01, -2.800000774859811e-01, -3.199999165535541e-01, -3.599999761580282e-01, -4.000000059604645e-01, -4.400000357629004e-01, -4.800000655653367e-01, -5.199999046329093e-01, -5.599999642370996e-01, -6.000000238418579e-01, -6.400000238419719e-01, -6.800000834467301e-01, -7.199999523160571e-01, -7.599999523161702e-01, -8.00000011920929e-01, -8.400000119210425e-01, -8.800000715258008e-01, -9.199999403951278e-01, -9.599999403955259e-01, -1e+00, -1.040000000000114e+00, -1.080000119209517e+00, -1.119999928474199e+00, -1.159999928474313e+00, -1.200000047683716e+00, -1.239999856952036e+00, -1.280000047682124e+00, -1.319999976159733e+00, -1.360000166889822e+00, -1.399999976158142e+00, -1.439999904635751e+00, -1.48000009536584e+00, -1.51999990463416e+00, -1.560000095364249e+00, -1.600000023841858e+00, -1.639999833110178e+00, -1.680000023840267e+00, -1.719999952317876e+00, -1.760000143047964e+00, -1.799999952316284e+00, -1.839999880793894e+00, -1.880000071523982e+00, -1.919999880792302e+00, -1.96000019073168e+00, -2e+00]
-time=[0e+00, 1e+01]
-gain.y=[9.999999776482582e-03, 9.800000119209312e-03, 9.600000461935905e-03, 9.39999988824146e-03, 9.200000216066644e-03, 8.999999612569809e-03, 8.800000000000266e-03, 8.600000268220769e-03, 8.399999724328651e-03, 8.199999992549153e-03, 8.00000037997961e-03, 7.799999836087635e-03, 7.600000223516557e-03, 7.399999906868604e-03, 7.199999828636792e-03, 7.000000216066837e-03, 6.800000137835594e-03, 6.600000059603783e-03, 6.399999742955831e-03, 6.200000130384752e-03, 6.000000052154064e-03, 5.799999735504975e-03, 5.599999895692688e-03, 5.400000044702666e-03, 5.20000020489038e-03, 4.999999888241291e-03, 4.800000037251268e-03, 4.600000197440092e-03, 4.399999880791003e-03, 4.200000040979828e-03, 4.000000189989805e-03, 3.799999873339606e-03, 3.600000033527874e-03, 3.399999949708318e-03, 3.200000109896587e-03, 3.000000026077032e-03, 2.799999709427944e-03, 2.600000102445745e-03, 2.40000001862619e-03, 2.200000178814458e-03, 2.000000094994903e-03, 1.799999778345259e-03, 1.599999578110936e-03, 1.400000331551885e-03, 1.200000247731773e-03, 1.000000047497451e-03, 7.999997890554668e-04, 5.999996470282527e-04, 4.0000037136537e-04, 2.000001856826147e-04, -0e+00, -2.000001856826147e-04, -4.000003713653699e-04, -5.999996470282527e-04, -7.999997890554687e-04, -1.000000047497451e-03, -1.200000247731775e-03, -1.400000331551883e-03, -1.599999578110936e-03, -1.799999778345257e-03, -2.000000094994903e-03, -2.200000178814458e-03, -2.400000495462438e-03, -2.599999625607276e-03, -2.799999709427944e-03, -3.000000026077032e-03, -3.200000109896589e-03, -3.400000426544567e-03, -3.599999556691628e-03, -3.799999873339605e-03, -4.000000189989805e-03, -4.200000040979827e-03, -4.400000357626695e-03, -4.599999720599959e-03, -4.800000037251269e-03, -4.999999888241291e-03, -5.20000020489038e-03, -5.40000052153947e-03, -5.599999418855887e-03, -5.799999735504976e-03, -6.000000052154064e-03, -6.199999415141079e-03, -6.4000002197863e-03, -6.599999582777752e-03, -6.800000853070945e-03, -7.000000216066837e-03, -7.199999113401442e-03, -7.400000383694632e-03, -7.599999746686088e-03, -7.800000551331312e-03, -8.00000037997961e-03, -8.199999277305334e-03, -8.400000081950562e-03, -8.599999910598861e-03, -8.800000715244082e-03, -8.999999612569809e-03, -9.199999441218108e-03, -9.400000245863332e-03, -9.600000074511634e-03, -9.800000879156858e-03, -9.999999776482582e-03]
-volSte.Xi[1]=[1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 1.499999966472387e-02, 9.999999776482582e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03, 4.999999888241291e-03]
-volDyn.Xi[1]=[9.999999776482582e-03, 1.076057272843535e-02, 1.139341479278666e-02, 1.19215510200276e-02, 1.23635716491088e-02, 1.273458451032639e-02, 1.304688297716053e-02, 1.331050789960336e-02, 1.353367229298468e-02, 1.372310895841858e-02, 1.388435903936625e-02, 1.40219926526208e-02, 1.413978444724089e-02, 1.424086191432861e-02, 1.432782599734874e-02, 1.440284121781588e-02, 1.446771247716015e-02, 1.452395224274218e-02, 1.457282902953405e-02, 1.461540722291566e-02, 1.465258188545704e-02, 1.468511301163658e-02, 1.471364403715424e-02, 1.473872085277473e-02, 1.476080527390254e-02, 1.478029321879148e-02, 1.479752083903564e-02, 1.481277494929855e-02, 1.482630055997936e-02, 1.483831181030214e-02, 1.484899036586285e-02, 1.48584917272201e-02, 1.486695371183177e-02, 1.48744927752742e-02, 1.488120853289398e-02, 1.488718949258327e-02, 1.489251200582232e-02, 1.489724125498171e-02, 1.490143500454089e-02, 1.490514073185167e-02, 1.490840315818787e-02, 1.49112585957063e-02, 1.491373777821181e-02, 1.491586677349943e-02, 1.491766888488399e-02, 1.491916179656982e-02, 1.492036320367252e-02, 1.492128428216511e-02, 1.492193620548043e-02, 1.492232363643975e-02, 1.492225285619497e-02, 1.490579914558584e-02, 1.485635140792661e-02, 1.477454620756386e-02, 1.466119487653128e-02, 1.451738923788071e-02, 1.434452720532669e-02, 1.414426654379458e-02, 1.391850829331752e-02, 1.366936440034229e-02, 1.339911576360464e-02, 1.311019313876356e-02, 1.280515208634135e-02, 1.24865813760208e-02, 1.215712478495353e-02, 1.181940082460642e-02, 1.147598274611429e-02, 1.112939630494595e-02, 1.078205808145035e-02, 1.043624743161363e-02, 1.009411830455065e-02, 9.757646042618671e-03, 9.428615995474256e-03, 9.108628749122126e-03, 8.799073577299863e-03, 8.501149713993073e-03, 8.215849954621849e-03, 7.943969648562773e-03, 7.686108366014923e-03, 7.442677154477766e-03, 7.213915232568979e-03, 6.999900427135531e-03, 6.800559451460737e-03, 6.615694488286647e-03, 6.444983496187684e-03, 6.288010161370039e-03, 6.144269432513008e-03, 6.013186878103557e-03, 5.894136833286879e-03, 5.786444140207743e-03, 5.689418409019709e-03, 5.602343791215439e-03, 5.524503859976775e-03, 5.455203945991863e-03, 5.393730724419054e-03, 5.339412018656731e-03, 5.291623701926746e-03, 5.249711145530877e-03, 5.21311543029883e-03, 5.181298479830394e-03, 5.153735633939505e-03]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeSteadyStateMass.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeSteadyStateMass.txt
new file mode 100644
index 00000000..74dc8d0b
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeSteadyStateMass.txt
@@ -0,0 +1,7 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'number of continuous time states': '2', 'linear': '0'}
+vol.dynBal.m=[1.20000004768371582031, 1.20000004768371582031]
+time=[0., 1.]
+vol.T=[293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375]
+vol.ports[2].m_flow=[-0.00999999977648258209, -0.00980000011175867491, -0.00960000044703476947, -0.00939999985098829982, -0.00920000018626438223, -0.00899999962747108188, -0.008799999925493995, -0.00860000029802314089, -0.00839999966472450635, -0.00820000011175910787, -0.00800000040978140516, -0.00779999977648265438, -0.00760000007450550592, -0.00739999990686832001, -0.00719999988824135753, -0.00700000033527540567, -0.00680000001862605171, -0.00659999999999978312, -0.00639999998137434807, -0.00620000013038489364, -0.00600000011175834749, -0.00579999979510982793, -0.00559999977648272668, -0.00540000022351691273, -0.0051999999068683923, -0.00499999988824129105, -0.00480000003725183661, -0.00460000031664837584, -0.00439999999999985542, -0.00419999968335133499, -0.00400000042840694108, -0.00380000011175842022, -0.00359999979510989936, -0.0034000003073348618, -0.00319999999068675727, -0.0029999999068677707, -0.00280000018626444871, -0.00260000010244546128, -0.00240000001862647342, -0.00219999970197684233, -0.00200000021420347011, -0.00179999989755474216, -0.0015999996973209878, -0.00140000009313222436, -0.00120000000931323671, -0.00099999980907892745, -0.0008000001466830234, -0.0006000000046566537, -0.00039999977531894756, -0.00020000018568204714, 0., 0.00020000018567920501, 0.0004000003713585488, 0.00060000060069273628, 0.0007999995506446021, 0.00099999980908248125, 0.00120000000931252742, 0.00140000009313009151, 0.00160000029336155886, 0.00180000049359302599, 0.00199999961816496033, 0.00219999970198110585, 0.00240000001862789459, 0.00260000010244404011, 0.0028000001862601852, 0.00300000050290697437, 0.00319999939465131795, 0.00339999971129505401, 0.0035999997951120322, 0.00380000011175912972, 0.0040000004284033875, 0.00420000027939277515, 0.0043999994039655415, 0.00459999972060677956, 0.00480000003725467896, 0.00499999988824129105, 0.00520000020488697, 0.00540000052153264895, 0.00560000037252370107, 0.00579999949709480295, 0.0059999998137404819, 0.00620000013038418413, 0.00639999998137221523, 0.00660000029801622885, 0.0068000006146619078, 0.0069999997392341199, 0.00719999959022406179, 0.00739999990686974075, 0.0076000002235154197, 0.00780000007450314201, 0.00800000085680122562, 0.00819999951571714729, 0.00839999936671152921, 0.00860000014901294435, 0.00880000000000097544, 0.0089999998509861668, 0.0092000006332853615, 0.00939999929220017121, 0.00960000007450935791, 0.00979999992549597, 0.00999999977648258209]
+sou.ports[1].m_flow=[-0.00999999977648258209, -0.00980000011175867491, -0.00960000044703476947, -0.00939999985098829982, -0.00920000018626438223, -0.00899999962747108188, -0.008799999925493995, -0.00860000029802314089, -0.00839999966472450635, -0.00820000011175910787, -0.00800000040978140516, -0.00779999977648265438, -0.00760000007450550592, -0.00739999990686832001, -0.00719999988824135753, -0.00700000033527540567, -0.00680000001862605171, -0.00659999999999978312, -0.00639999998137434807, -0.00620000013038489364, -0.00600000011175834749, -0.00579999979510982793, -0.00559999977648272668, -0.00540000022351691273, -0.0051999999068683923, -0.00499999988824129105, -0.00480000003725183661, -0.00460000031664837584, -0.00439999999999985542, -0.00419999968335133499, -0.00400000042840694108, -0.00380000011175842022, -0.00359999979510989936, -0.0034000003073348618, -0.00319999999068675727, -0.0029999999068677707, -0.00280000018626444871, -0.00260000010244546128, -0.00240000001862647342, -0.00219999970197684233, -0.00200000021420347011, -0.00179999989755474216, -0.0015999996973209878, -0.00140000009313222436, -0.00120000000931323671, -0.00099999980907892745, -0.0008000001466830234, -0.0006000000046566537, -0.00039999977531894756, -0.00020000018568204714, 0., 0.00020000018567920501, 0.0004000003713585488, 0.00060000060069273628, 0.0007999995506446021, 0.00099999980908248125, 0.00120000000931252742, 0.00140000009313009151, 0.00160000029336155886, 0.00180000049359302599, 0.00199999961816496033, 0.00219999970198110585, 0.00240000001862789459, 0.00260000010244404011, 0.0028000001862601852, 0.00300000050290697437, 0.00319999939465131795, 0.00339999971129505401, 0.0035999997951120322, 0.00380000011175912972, 0.0040000004284033875, 0.00420000027939277515, 0.0043999994039655415, 0.00459999972060677956, 0.00480000003725467896, 0.00499999988824129105, 0.00520000020488697, 0.00540000052153264895, 0.00560000037252370107, 0.00579999949709480295, 0.0059999998137404819, 0.00620000013038418413, 0.00639999998137221523, 0.00660000029801622885, 0.0068000006146619078, 0.0069999997392341199, 0.00719999959022406179, 0.00739999990686974075, 0.0076000002235154197, 0.00780000007450314201, 0.00800000085680122562, 0.00819999951571714729, 0.00839999936671152921, 0.00860000014901294435, 0.00880000000000097544, 0.0089999998509861668, 0.0092000006332853615, 0.00939999929220017121, 0.00960000007450935791, 0.00979999992549597, 0.00999999977648258209]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeTraceSubstance.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeTraceSubstance.txt
new file mode 100644
index 00000000..56a96a04
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeTraceSubstance.txt
@@ -0,0 +1,13 @@
+last-generated=2016-01-22
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "3",
+ "linear": " "
+}
+volDyn.ports[1].m_flow=[0.5, 0.5]
+time=[0., 10.]
+C_flow.y=[0.00050000002374872565, 0.00050000002374872565]
+volSte.C[1]=[0.00100000004749745131, 0.00100000004749745131]
+volDyn.C[1]=[0., 0.00004081370147314194, 0.00007997975511642466, 0.00011756925519508236, 0.00015363798381706962, 0.00018821634876076132, 0.00022140955065617411, 0.00025322914377289994, 0.00028375157496050537, 0.00031301295483017472, 0.00034107192186638713, 0.00036796894807408873, 0.00039375580918694035, 0.00041848573586655629, 0.00044220590467833169, 0.00046496037975884974, 0.00048677480151692665, 0.00050770344860908627, 0.00052779046588014901, 0.00054704468213698655, 0.00056551623856648803, 0.00058324310715453427, 0.00060024391062795464, 0.00061654777558734668, 0.00063219158606901682, 0.00064720149384811521, 0.00066159608715750276, 0.0006754044378615092, 0.00068865024402223792, 0.0007013567836993026, 0.00071354524698108435, 0.00072523615013376716, 0.00073645193535117949, 0.00074721192277336012, 0.00075753445467384906, 0.00076743750832974911, 0.00077693799695789103, 0.00078605208118528601, 0.00079479552047917847, 0.0008031834071065483, 0.0008112291106954217, 0.00081894559106305404, 0.00082634495550283551, 0.00083343846324655921, 0.00084024189798503294, 0.00084677251288667321, 0.00085303607047937944, 0.00085904281539362867, 0.00086480244146857146, 0.00087032420042992343, 0.00087562075350433588, 0.00088070362580533912, 0.00088557852174698561, 0.00089025356861337777, 0.00089473649439069812, 0.00089903449406847358, 0.0009031578703965796, 0.0009071144814625301, 0.00091090937364612251, 0.00091454892776459914, 0.00091803906252607703, 0.00092138536585545676, 0.00092459633612563283, 0.00092767725586439533, 0.00093063234540096979, 0.00093346642097458243, 0.00093618408098211886, 0.00093878957461835299, 0.00094129034081679829, 0.00094368954662626741, 0.00094599078875035048, 0.00094819767605847289, 0.00095031381745336687, 0.00095234234669793947, 0.00095428904568739363, 0.00095615611644461751, 0.00095794670217497376, 0.00095966388790780536, 0.00096131057635339952, 0.00096288975180130879, 0.00096440414199605584, 0.00096585647589576807, 0.00096724939325981316, 0.00096858537039618182, 0.00096986693573997335, 0.0009710963349789381, 0.00097227468644677363, 0.00097340479470470935, 0.0009744885008012204, 0.00097552774627764939, 0.00097652443218976259, 0.00097748019839602332, 0.00097839685793018032, 0.00097927590667249874, 0.00098011910763455318, 0.00098092795815318823, 0.00098170386336222655, 0.00098244846005598628, 0.00098316289816161311, 0.00098384882113128043, 0.00098450749646872282]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeTraceSubstanceReverseFlowPrescribedHeatFlowRate.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeTraceSubstanceReverseFlow.txt
similarity index 99%
rename from BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeTraceSubstanceReverseFlowPrescribedHeatFlowRate.txt
rename to BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeTraceSubstanceReverseFlow.txt
index 6372d98c..bdfe1afa 100644
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeTraceSubstanceReverseFlowPrescribedHeatFlowRate.txt
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeTraceSubstanceReverseFlow.txt
@@ -4,10 +4,10 @@ statistics-simulation=
"numerical Jacobians": "0",
"nonlinear": " ",
"number of continuous time states": "3",
- "linear": " "
+ "linear": "0, 0, 0"
}
volDyn.ports[1].m_flow=[2., 1.96000003874302031193, 1.91999995827675129512, 1.88000000000000699885, 1.84000003576279036466, 1.79999995231628417969, 1.76000000000000000888, 1.72000002384185779469, 1.67999995231628407311, 1.63999997615814208096, 1.60000002384185791016, 1.55999995231631261028, 1.51999999999994317434, 1.48000000000005682566, 1.44000004768368738972, 1.39999997615814208984, 1.36000002384188634075, 1.32000007152523268772, 1.27999995231634100534, 1.23999999999997156941, 1.20000004768371582031, 1.15999992847431254717, 1.12000002384191477134, 1.08000002384180104897, 1.04000000000011372236, 1., 0.95999994039552571934, 0.92000003576270150685, 0.87999997615808511764, 0.84000001192104267744, 0.80000001192092895508, 0.75999995231617045732, 0.72000004768363046193, 0.67999998807901407272, 0.64000002384197141048, 0.60000002384185791016, 0.55999996423709963445, 0.52000000000005675016, 0.47999997019769191642, 0.44000003576290042107, 0.40000000596046447754, 0.35999997615802853401, 0.31999991655355408682, 0.28000007748598143564, 0.24000003278259712802, 0.20000000298023223877, 0.1599999582767058226, 0.11999992102383175152, 0.08000007450589130542, 0.0400000372529454723, -0., -0.0400000372529454723, -0.08000007450589130542, -0.11999992102383175152, -0.15999995827670615567, -0.20000000298023223877, -0.24000003278259746109, -0.28000007748598110258, -0.31999991655355408682, -0.35999997615802820095, -0.40000000596046447754, -0.44000003576290042107, -0.48000006556533669766, -0.51999990463290934883, -0.55999996423709963445, -0.60000002384185791016, -0.64000002384197185457, -0.68000008344673013028, -0.71999995231605706802, -0.75999995231617023528, -0.80000001192092895508, -0.8400000119210424554, -0.88000007152580084213, -0.91999994039512777988, -0.95999994039552594138, -1., -1.04000000000011350032, -1.08000011920951699551, -1.11999992847419926889, -1.15999992847431276921, -1.20000004768371582031, -1.23999985695203629454, -1.28000004768212405359, -1.31999997615973319043, -1.36000016688982228175, -1.39999997615814208984, -1.43999990463575144872, -1.48000009536583987391, -1.51999990463416012609, -1.56000009536424855128, -1.60000002384185791016, -1.63999983311017771825, -1.68000002384026680957, -1.71999995231787594641, -1.76000014304796370546, -1.79999995231628417969, -1.83999988079389353857, -1.88000007152398196375, -1.91999988079230221594, -1.9600001907316801919, -2.]
time=[0., 10.]
gain.y=[0.00200000009499490261, 0.00196000002384186245, 0.0019199999526888225, 0.00188000000093135628, 0.00184000004321334962, 0.00179999996908009052, 0.00176000002328297891, 0.00171999993722890109, 0.00167999999143185886, 0.00164000002179289493, 0.00159999995958060026, 0.00156000001378351705, 0.00152000006798632022, 0.00147999995809071187, 0.00144000001229337626, 0.00139999995008111, 0.00136000000428416557, 0.00132000005848682974, 0.00127999994859122183, 0.001240000002793886, 0.00120000005699694157, 0.00115999994710110597, 0.00112000004898745332, 0.00107999993909161773, 0.00104000004097796507, 0.00100000004749745131, 0.00095999993760133816, 0.00092000003948810173, 0.00087999998779964949, 0.00084000003147875237, 0.00079999997979030013, 0.00075999998630950881, 0.00072000002998861147, 0.00067999997830015923, 0.00064000002197926189, 0.00060000002849847078, 0.00055999997681001877, 0.0005200000204891212, 0.00047999996880073858, 0.00044000004158360208, 0.00039999998989515007, 0.0003599999673105285, 0.00031999991562207611, 0.00028000008377256427, 0.00024000003208411185, 0.00019999999494757503, 0.00015999995781103786, 0.00011999992067457079, 0.00008000007427307399, 0.00004000003713653682, -0., -0.00004000003713653682, -0.00008000007427307399, -0.00011999992067457079, -0.00015999995781103822, -0.00019999999494757503, -0.0002400000320841122, -0.00028000008377256389, -0.00031999991562207605, -0.00035999996731052813, -0.00039999998989515007, -0.00044000004158360208, -0.00048000006416822402, -0.00051999992512156631, -0.00055999997681001877, -0.00060000002849847078, -0.00064000002197926232, -0.00068000007366771434, -0.00071999993462105701, -0.00075999998630950859, -0.00079999997979030013, -0.00084000003147875215, -0.00088000008316720417, -0.00091999994412054684, -0.00095999993760133837, -0.00100000004749745131, -0.00104000004097796485, -0.00108000003445958906, -0.00111999995361948242, -0.00115999994710110619, -0.00120000005699694157, -0.00123999985974515147, -0.00128000004395726003, -0.00131999996312079089, -0.00136000014733290097, -0.00139999995008111, -0.00143999986924464086, -0.00148000005345675029, -0.0015199999726202818, -0.00156000015683017078, -0.00159999995958060026, -0.00163999987874413112, -0.0016800000629562412, -0.00171999986570556046, -0.00176000016632966039, -0.00179999996908009052, -0.00183999988824362138, -0.00188000007245573081, -0.00191999987520505072, -0.00196000017583137153, -0.00200000009499490261]
-volSte.C[1]=[0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00150000001303851604, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261]
+volSte.C[1]=[0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261, 0.00200000009499490261]
volDyn.C[1]=[0., 0.00015226464682516869, 0.00027904368120625181, 0.00038466709078702828, 0.00047295190835593229, 0.00054707133676856756, 0.00060947761879871808, 0.00066217076368175576, 0.0007067939100399188, 0.00074469654010665416, 0.00077698356471955776, 0.00080452986842292321, 0.00082810123094395345, 0.00084831799328534169, 0.00086570473301067854, 0.00088070024503394961, 0.00089366896717726625, 0.0009049120075667581, 0.00091467908778906167, 0.0009231824679329665, 0.00093059852952137589, 0.00093707838665991181, 0.0009427597371287319, 0.00094775832478530481, 0.00095215724614999451, 0.00095605099340900779, 0.00095949380498189533, 0.0009625477818861459, 0.00096525892269935917, 0.00096766586429502882, 0.00096980342641472816, 0.00097170251124695402, 0.000973392975678277, 0.00097489997345970368, 0.00097624532522971755, 0.00097744772210717201, 0.00097852095591333208, 0.00097947544374948859, 0.00098031887356159241, 0.00098106660812258208, 0.0009817248210310936, 0.00098229653717896203, 0.0009827946787068784, 0.00098322192130706411, 0.00098358176151092081, 0.00098388083279132843, 0.00098412111421264403, 0.00098430539975979969, 0.00098443590083707711, 0.00098451389925702237, 0.00098457257263362408, 0.00098629168110831215, 0.00099124330037782152, 0.00099958058465097663, 0.00101117811801097962, 0.00102589582093060017, 0.00104358095662972607, 0.00106406472175594839, 0.00108714117733850263, 0.00111261158996187417, 0.00114023336209356785, 0.00116978134615644547, 0.00120097637708244391, 0.00123357452196042961, 0.00126728866256828028, 0.00130186171736568213, 0.00133702185586562672, 0.00137251307992165383, 0.0014081043677004934, 0.00144353645280411824, 0.00147861102595925331, 0.00151312703722175949, 0.00154684373923258856, 0.00157969042989119721, 0.00161145612873367307, 0.00164197920821607113, 0.00167125722311481178, 0.00169910053270188504, 0.00172551669837268419, 0.00175045579680797045, 0.00177385355345904827, 0.00179577587425425308, 0.00181615775438829716, 0.00183507493924719533, 0.00185253570595588857, 0.00186857162043452263, 0.00188326981569354886, 0.00189664927391952989, 0.0019088010080992692, 0.00191979032688970107, 0.001929687918163836, 0.00193856362275276182, 0.00194650203003655562, 0.00195356433858402938, 0.00195983194174280872, 0.00196537235751748085, 0.00197024758071724778, 0.00197452540329905992, 0.00197825999256833092, 0.00198150939514514859, 0.00198432500474154949]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeZeroFlow.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeZeroFlow.txt
new file mode 100644
index 00000000..da5dca32
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MixingVolumeZeroFlow.txt
@@ -0,0 +1,12 @@
+last-generated=2016-12-13
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": "0, 0"
+}
+volNonLinSys.heatPort.Q_flow=[0., 0.04054430962825330415, 0.08108850004721039617, 0.12163255635571253166, 0.16217647855375569299, 0.20272025163891399524, 0.24326389081613730703, 0.28380733607579933242, 0.32435063252621837426, 0.36489369015348055436, 0.40543656937141731023, 0.44597923997298183352, 0.48652167215586511473, 0.52706386591997389512, 0.56760573145498016689, 0.60814729896693997535, 0.64868856926235352045, 0.68922948112352300232, 0.72976991614796038466, 0.77031005395405749425, 0.81084959490921415526, 0.85138871943496441386, 0.89192718750690591634, 0.93246499992839437798, 0.9730021574992328004, 1.01353847980499267578, 1.05407396844353917764, 1.09460826339644090588, 1.13514148705813089357, 1.17567339941472215337, 1.21620376046909783874, 1.25673233496487135596, 1.29725900210746480923, 1.33778304508249701321, 1.37830422859677637071, 1.41882207424341610924, 1.45933550761498431747, 1.49984393572519181248, 1.54034592652182666939, 1.58083957265113994595, 1.62132248850021842834, 1.66179133908430198829, 1.70224040088333250509, 1.74266144723384464044, 1.78304065235708186776, 1.82335262328710934199, 1.86354693402136861735, 1.90350640293454365093, 1.94287924138528600437, 1.9799109366468417015, -0.00000000000023891699, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+volLinSys.heatPort.Q_flow=[0.80709874629974365234, 0.79759460649391933362, 0.77550905811251547028, 0.74129402361053109427, 0.69559806118312195178, 0.63925517055183977977, 0.57326995370595290602, 0.49880051844007267103, 0.41713817381217915825, 0.32968571999646117954, 0.23793285982367853859, 0.14343140450395483465, 0.04776826170339396049, -0.04746144662394822383, -0.14068167853088567321, -0.23036264603789247118, -0.31504693546687956296, -0.39337422094151264229, -0.46410540884610718138, -0.52614380273723904136, -0.57855407942414149858, -0.62057914679070236286, -0.65165341190407255478, -0.6714134152964903457, -0.6797045476882763726, -0.67658472061157226562, -0.66232440876778497785, -0.63740286366134391027, -0.60250103934975152153, -0.55849101028515013567, -0.50642240645002301047, -0.44750489266919990516, -0.38308916658616481987, -0.31464484531279113266, -0.24373521977932938176, -0.17199275105728467627, -0.10109102331713079592, -0.03271615717911940252, 0.03146045580433719235, 0.08981135039976288759, 0.14078036090237672218, 0.18290985926129751937, 0.21486483853385449083, 0.23545647028336857964, 0.24366250643457101899, 0.23864403277225679223, 0.21975949965161695188, 0.18657363451912403751, 0.13886205755889263758, 0.07660954228733986293, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+volT.heatPort.Q_flow=[4.1840000152587890625, 4.06798791541768256508, 3.89044975286021488259, 3.65677378786890372453, 3.37314984405393847311, 3.0464344279626649481, 2.68400401734905846851, 2.29360462426205780062, 1.88319532533618416714, 1.46079781959408205871, 1.03434175643454540072, 0.6115226496831283054, 0.19966369509532555515, -0.19440967111931869993, -0.56448242908144352636, -0.90504877115990933767, -1.21139333869201260008, -1.47965355177225110772, -1.70686825973506639542, -1.89100293105128458571, -2.03095623190027918525, -2.1265509582403940847, -2.17850351648146389749, -2.1883780983161589262, -2.15852400829689372586, -2.09200000762939453125, -1.99248374223350266377, -1.86417403801806003116, -1.71168138515993795146, -1.53991600660334282402, -1.35397111222652677398, -1.1590018742906138538, -0.96011338302223658836, -0.7622460316973269645, -0.57006747323511086645, -0.38787801595940657462, -0.21952118800433551016, -0.06830610479647326871, 0.06305178688669524356, 0.17248088385610327311, 0.25858537760020744445, 0.32066290292618138125, 0.35870391278355434617, 0.37337746815852412841, 0.36600055818258669937, 0.33849267536813770763, 0.29331742059927073951, 0.23341108056189741049, 0.16210199127545940612, 0.08302023562794788591, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+volQflow.heatPort.Q_flow=[1., 0.98000001862645069739, 0.95999997764825650837, 0.939999996274708427, 0.92000001490115790315, 0.89999997764826100699, 0.87999999254941441151, 0.86000001490116340097, 0.83999997019773087192, 0.82000000000000006217, 0.80000001490116123826, 0.77999997019769540252, 0.75999998509883881503, 0.73999999999999999112, 0.72000002980230459748, 0.69999999999999995559, 0.67999999999999993783, 0.66000002980226901705, 0.64000000000000001332, 0.61999999999999999556, 0.60000002980223354765, 0.57999997019767768336, 0.56000000000000005329, 0.54000002980232242322, 0.51999997019767763007, 0.5, 0.47999997019781970309, 0.46000002980216248005, 0.43999999999999994671, 0.41999997019780199725, 0.4000000298023224099, 0.38000000000000000444, 0.35999999999999998668, 0.34000002980232235661, 0.31999999999999995115, 0.30000000000000004441, 0.28000002980232241434, 0.26000000000000000888, 0.23999998509887432441, 0.21999997019778416707, 0.20000001490111674052, 0.18000000000000004885, 0.15999997019777534302, 0.14000001490110791647, 0.11999999254942828042, 0.09999997764830259595, 0.08000001490113006763, 0.05999999627471641617, 0.03999997764829821278, 0.02000001862641598294, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+time=[0., 2.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MoistureMixingConservationDynamicBalance.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MoistureMixingConservationDynamicBalance.txt
deleted file mode 100644
index fec0ec54..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MoistureMixingConservationDynamicBalance.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-last-generated=2016-11-02
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "12",
- "linear": " "
-}
-senMasFlo.m_flow=[3., 3.]
-time=[0., 1.]
-senSpeEnt.H_flow=[135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125, 135902.828125]
-senMasFra.X=[0.00999999977648258209, 0.00999846402548230928, 0.00999396014930829801, 0.00998659431874560771, 0.0099766412739578092, 0.00996405631405407333, 0.00994883477469135635, 0.00993175897800735626, 0.00991249084104284944, 0.00989099965299831789, 0.00986728538194380639, 0.00984134897427119473, 0.00981318949890063082, 0.00978485679729471092, 0.00975513830961865711, 0.00972384961361668146, 0.00969098972810425105, 0.00965655968220107026, 0.00962055849668658376, 0.0095829861146772468, 0.00954384357922436269, 0.00950312984238638192, 0.00946084502569112182, 0.00941699000068853612, 0.00937156376742608911, 0.00932716671377420425, 0.00928226295240284181, 0.00923628737540572661, 0.00918923877745613134, 0.00914111729367403369, 0.00909192307248762009, 0.00904165675209564826, 0.00899031661458134755, 0.00893790468052321589, 0.0088844197063735076, 0.0088298618464473632, 0.00877423219951084868, 0.00872003103362612234, 0.00866623220247536227, 0.00861190810434447028, 0.00855705983493309022, 0.0085016861358803552, 0.00844578810115341125, 0.0083893649685146416, 0.0083324164015621538, 0.00827494256760621938, 0.00821694457172784769, 0.0081584211368756071, 0.00809937336632473096, 0.00804134370626374828, 0.00798406172543764114, 0.00792664842785399497, 0.00786910381352975974, 0.00781142648549439881, 0.0077536181856960951, 0.00769567729367908772, 0.00763760461926450435, 0.00757940016243445307, 0.00752106345754331631, 0.00746259543591436692, 0.00740399551591604862, 0.00734569559709423361, 0.00728781430946499019, 0.00723001777235212587, 0.00717232228395065733, 0.00711474321112303115, 0.00705729765966734476, 0.00700000031158547892, 0.00694286734221946904, 0.00688591504977058896, 0.00682915926679320516, 0.00677261582579318823, 0.00671630089423607985, 0.00666023009887425649, 0.00660441914297481541, 0.0065488843247294426, 0.00649364147672404444, 0.00643870643143350761, 0.00638409548704951639, 0.00632982433281895508, 0.00627590861993312672, 0.00622236450544438619, 0.00616920828759656963, 0.00611645486756755112, 0.00606412100918550002, 0.00601215672950829172, 0.00596049062823098257, 0.00590926271503436785, 0.00585848789116956946, 0.00580818059218312158, 0.00575835571922844736, 0.0057090275346613319, 0.00566021035155668626, 0.00561191890102127975, 0.00556416808428258219, 0.00551697233694031959, 0.00547034609446174665, 0.00542430453068565559, 0.0053788610664818725, 0.00533403134499605032, 0.00528982933610677719]
-cheMasFra.y=[-0.00000000000000000694, -0.00000000000000000694, 0., -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, 0., -0.00000000000000000694, -0., -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0., -0., -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0., -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0., -0.00000000000000000694, -0., -0., -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000000694, -0.00000000000000001388, -0.00000000000000002082, -0.00000000000000002082, -0.00000000000000002776, -0.00000000000000003469, -0.00000000000000003469, -0.00000000000000004857, -0.00000000000000005551, -0.00000000000000006245, -0.00000000000000006245, -0.00000000000000007633, -0.00000000000000008327, -0.00000000000000009714, -0.00000000000000010408, -0.00000000000000011796, -0.00000000000000013878, -0.00000000000000015266, -0.00000000000000015959, -0.00000000000000018041, -0.00000000000000020123, -0.00000000000000022204, -0.00000000000000024286, -0.0000000000000002498, -0.00000000000000025674, -0.00000000000000027062, -0.00000000000000027756, -0.00000000000000028449, -0.00000000000000029837, -0.00000000000000030531, -0.00000000000000031225, -0.00000000000000031919, -0.00000000000000032613, -0.00000000000000033307, -0.00000000000000034001, -0.00000000000000034001, -0.00000000000000034694, -0.00000000000000035388]
-cheMasFlo.y=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
-cheSpeEnt.y=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MoistureMixingConservationSteadyState.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MoistureMixingConservationSteadyState.txt
deleted file mode 100644
index 233356e8..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_MoistureMixingConservationSteadyState.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-last-generated=2016-11-02
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-senMasFlo.m_flow=[3., 3.]
-time=[0., 1.]
-senSpeEnt.H_flow=[135902.828125, 135902.828125]
-cheMasFra.y=[-0., -0.]
-cheMasFlo.y=[0., 0.]
-cheSpeEnt.y=[0., 0.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_TraceSubstanceConservationDynamicBalance.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_TraceSubstanceConservationDynamicBalance.txt
deleted file mode 100644
index 75a69866..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_TraceSubstanceConservationDynamicBalance.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-last-generated=2016-11-02
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "5",
- "linear": " "
-}
-senTraSubOut.C=[0., 0.00000829873370360817, 0.00001652875326045848, 0.00002469066985099457, 0.00003278553121329992, 0.00004081375968282272, 0.00004877512143869788, 0.00005667164781883009, 0.00006450560752693335, 0.00007227514739045887, 0.00007998027171362452, 0.00008762097468043793, 0.00009519726356569228, 0.00010270913109871437, 0.00011017175667111301, 0.00011757610187777413, 0.00012492061330143271, 0.00013220525449694941, 0.00013943004372505774, 0.00014659497707619765, 0.00015370006229174343, 0.00016074530599595308, 0.00016773068719965622, 0.00017465620188332888, 0.00018152188934288403, 0.00018832771456800401, 0.00019507368327682887, 0.00020180317376173009, 0.00020849176428422249, 0.00021512843346554932, 0.00022171319087323772, 0.00022824607576047882, 0.00023472703930779473, 0.00024115607699121797, 0.00024753325624311237, 0.00025385851415633056, 0.00026013183211548864, 0.00026635327662829264, 0.0002725228289075867, 0.00027864045984933209, 0.00028470618057185214, 0.00029072002721699641, 0.00029668195252355122, 0.00030259196807353052, 0.00030845007998097219, 0.0003142562996522324, 0.00032001058092604866, 0.00032571298719935788, 0.00033136350123537546, 0.00033696207733675511, 0.00034250877797603607, 0.00034800358637659463, 0.0003534464734448102, 0.00035892428545790042, 0.00036442421247779238, 0.00036988363068820332, 0.00037530247808148244, 0.0003806807837558508, 0.00038601851861142211, 0.00039131571175362635, 0.00039657230287332477, 0.00040178838373458695, 0.00040696389377910258, 0.00041209886210653895, 0.00041719325961306553, 0.00042224711540632918, 0.00042726037062548722, 0.00043223311413829443, 0.00043716528683400825, 0.00044205688871075502, 0.00044690794886844521, 0.000451718467312907, 0.00045648838663190624, 0.00046121776369194241, 0.00046590659903857681, 0.00047055489267222583, 0.00047516261548114874, 0.00047972976747297826, 0.00048425637775196108, 0.00048874241970618963, 0.00049318791770429978, 0.00049759284488525056, 0.00050195720124361924, 0.00050628104499037332, 0.00051056431792051958, 0.00051480699487072414, 0.00051900918462351598, 0.00052317074535196981, 0.00052729179346696655, 0.00053137227076126173, 0.00053541223544570804, 0.00053941154739227035, 0.00054337037069239512, 0.00054728862317591229, 0.00055116630484028167, 0.00055500347388947398, 0.00055880007212132272, 0.0005625560772711403, 0.00056627153411915323, 0.00056994647835717862, 0.00057358085177838802]
-senTraSubIn.C=[0.00100000004749745131, 0.00100000004749745131]
-time=[0., 1.]
-cheConMas.y=[0., -0., 0.00000000000000000001, -0.00000000000000000002, -0.00000000000000000003, -0.00000000000000000005, -0.00000000000000000003, -0.0000000000000000005, -0.00000000000000000196, -0.00000000000000000399, -0.00000000000000000654, -0.0000000000000000097, -0.00000000000000001338, -0.00000000000000001766, -0.00000000000000001975, -0.00000000000000002134, -0.0000000000000000227, -0.00000000000000002379, -0.00000000000000002464, -0.00000000000000002526, -0.00000000000000002559, -0.00000000000000002571, -0.00000000000000002557, -0.00000000000000002511, -0.00000000000000002449, -0.00000000000000002359, -0.00000000000000002238, -0.00000000000000002246, -0.0000000000000000229, -0.00000000000000002334, -0.00000000000000002382, -0.00000000000000002434, -0.00000000000000002481, -0.00000000000000002538, -0.00000000000000002593, -0.0000000000000000265, -0.00000000000000002713, -0.0000000000000000277, -0.00000000000000002824, -0.00000000000000002898, -0.00000000000000002957, -0.00000000000000003025, -0.00000000000000003095, -0.00000000000000003162, -0.00000000000000003239, -0.00000000000000003305, -0.00000000000000003383, -0.00000000000000003463, -0.00000000000000003541, -0.00000000000000003621, -0.00000000000000003704, -0.00000000000000003792, -0.0000000000000000388, -0.00000000000000003949, -0.00000000000000003994, -0.00000000000000004033, -0.00000000000000004073, -0.00000000000000004127, -0.00000000000000004167, -0.00000000000000004201, -0.00000000000000004231, -0.00000000000000004274, -0.00000000000000004307, -0.00000000000000004348, -0.00000000000000004386, -0.00000000000000004421, -0.00000000000000004434, -0.00000000000000004467, -0.00000000000000004494, -0.00000000000000004516, -0.00000000000000004532, -0.00000000000000004578, -0.00000000000000004586, -0.00000000000000004605, -0.0000000000000000463, -0.00000000000000004638, -0.00000000000000004665, -0.00000000000000004684, -0.00000000000000004689, -0.00000000000000004708, -0.00000000000000004711, -0.00000000000000004743, -0.00000000000000004724, -0.00000000000000004733, -0.00000000000000004752, -0.00000000000000004746, -0.00000000000000004752, -0.0000000000000000476, -0.0000000000000000476, -0.0000000000000000476, -0.00000000000000004754, -0.00000000000000004754, -0.00000000000000004754, -0.00000000000000004738, -0.00000000000000004727, -0.00000000000000004727, -0.00000000000000004722, -0.00000000000000004695, -0.00000000000000004695, -0.00000000000000004667, -0.00000000000000004667]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_TraceSubstanceConservationSteadyState.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_TraceSubstanceConservationSteadyState.txt
deleted file mode 100644
index 8449bfa2..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_MixingVolumes_Validation_TraceSubstanceConservationSteadyState.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-last-generated=2016-11-02
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-const.k=[0.00100000004749745131, 0.00100000004749745131]
-time=[0., 2.]
-cheEquTra2.y=[0., 0.]
-cheEquTra1.y=[0., 0.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_BaseClasses_Validation_FlowMachineInterface.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_BaseClasses_Validation_FlowMachineInterface.txt
new file mode 100644
index 00000000..a065febb
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_BaseClasses_Validation_FlowMachineInterface.txt
@@ -0,0 +1,17 @@
+last-generated=2016-03-07
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+eff.V_flow=[0., 0.01000000000000000021, 0.02000000000000000042, 0.02999999999999999889, 0.04000000000000000083, 0.05000000000000000278, 0.05999999999999999778, 0.07000000000000000666, 0.08000000000000000167, 0.08999999999999999667, 0.10000000000000000555, 0.11000000000000000056, 0.11999999999999999556, 0.13000000000000000444, 0.14000000000000001332, 0.14999999999999999445, 0.16000000000000000333, 0.17000000000000001221, 0.17999999999999999334, 0.19000000000000000222, 0.2000000000000000111, 0.20999999999999999223, 0.22000000000000000111, 0.23000000000000000999, 0.23999999999999999112, 0.25, 0.26000000000000000888, 0.27000000000000001776, 0.28000000000000002665, 0.28999999999999998002, 0.2999999999999999889, 0.30999999999999999778, 0.32000000000000000666, 0.33000000000000001554, 0.34000000000000002442, 0.3499999999999999778, 0.35999999999999998668, 0.36999999999999999556, 0.38000000000000000444, 0.39000000000000001332, 0.4000000000000000222, 0.40999999999999997558, 0.41999999999999998446, 0.42999999999999999334, 0.44000000000000000222, 0.4500000000000000111, 0.46000000000000001998, 0.46999999999999997335, 0.47999999999999998224, 0.48999999999999999112, 0.5, 0.51000000000000000888, 0.52000000000000001776, 0.53000000000000002665, 0.54000000000000003553, 0.55000000000000004441, 0.56000000000000005329, 0.56999999999999995115, 0.57999999999999996003, 0.58999999999999996891, 0.5999999999999999778, 0.60999999999999998668, 0.61999999999999999556, 0.63000000000000000444, 0.64000000000000001332, 0.6500000000000000222, 0.66000000000000003109, 0.67000000000000003997, 0.68000000000000004885, 0.68999999999999994671, 0.69999999999999995559, 0.70999999999999996447, 0.71999999999999997335, 0.72999999999999998224, 0.73999999999999999112, 0.75, 0.76000000000000000888, 0.77000000000000001776, 0.78000000000000002665, 0.79000000000000003553, 0.80000000000000004441, 0.81000000000000005329, 0.81999999999999995115, 0.82999999999999996003, 0.83999999999999996891, 0.8499999999999999778, 0.85999999999999998668, 0.86999999999999999556, 0.88000000000000000444, 0.89000000000000001332, 0.9000000000000000222, 0.91000000000000003109, 0.92000000000000003997, 0.93000000000000004885, 0.93999999999999994671, 0.94999999999999995559, 0.95999999999999996447, 0.96999999999999997335, 0.97999999999999998224, 0.98999999999999999112, 1.]
+eff.m_flow=[0., 0.01200000037252894718, 0.02400000074505789435, 0.03599999925494219016, 0.0480000014901157887, 0.05999999776482610458, 0.07199999850988587913, 0.08399999850988389138, 0.09600000298022424994, 0.1079999985098865356, 0.1199999955296583154, 0.13199999999999734168, 0.14399999701977575506, 0.15600000894067539425, 0.1679999970197704473, 0.17999999999998222977, 0.19200000596044849988, 0.20399999403954352517, 0.21599999701974642585, 0.22800000298022157774, 0.23999999105931663079, 0.25200001192094850788, 0.26400000000000356515, 0.2759999880791207949, 0.28799999403955151012, 0.30000001192092895508, 0.31200001788127973423, 0.32399998807903906961, 0.33599999403954977639, 0.34800000000002484501, 0.35999999999996445954, 0.37200000596045734724, 0.38400001192095029046, 0.39599998211856751729, 0.40799998807911369569, 0.41999999403955323718, 0.43199999403949285171, 0.44399999999998579492, 0.45600000596047868262, 0.46800001192097162583, 0.47999998211867767051, 0.49200001788135078185, 0.50400002384170161651, 0.51599996423729843631, 0.52799999999997160316, 0.54000003576264477001, 0.55199997615824158981, 0.56400001192091475666, 0.57599998807926289235, 0.58799998807918474331, 0.60000002384185791016, 0.61199999999999998845, 0.62400003576221840795, 0.63600001192092903146, 0.64799997615878157653, 0.66000001192092905278, 0.67199998807905692022, 0.68400002384164471092, 0.69599999999999995204, 0.70800003576200520872, 0.71999999999999997335, 0.73199997615856837729, 0.74400001192092890534, 0.75599998807907109466, 0.76800002384143162271, 0.78000000000000002665, 0.79199996423799479128, 0.80400000000000004796, 0.81599997615835528908, 0.82800001192094307978, 0.83999998807907094722, 0.85200002384121842347, 0.86399998807907096854, 0.87599996423778159205, 0.88800000000000001155, 0.89999997615814208984, 0.91200001192064472644, 0.92400004768314736303, 0.93600002384100533526, 0.94799998807907104315, 0.95999996423756850383, 0.9719999999999858753, 0.984000035762573666, 0.9960000119204315272, 1.00800004768371587183, 1.01999995231770523851, 1.03199992847527899364, 1.04400002384185786042, 1.05600000000000004974, 1.06799997615814201701, 1.08000007152415267164, 1.09199997615814203833, 1.10399995231727898748, 1.11600004768371596775, 1.12800002384180109161, 1.1399999999999999023, 1.15199997615814209162, 1.16399999999999992362, 1.17599997615814211294, 1.1879999523168525144, 1.20000004768371582031]
+time=[0., 1.]
+eff.dp=[1000., 989.99999977648258209229, 979.99999955296527787141, 969.99999932944842839788, 959.99999910593044205598, 950.00000074505794600555, 939.99999865889571992739, 930.0000002980236786243, 919.99999821186429471709, 910.00000357627141056582, 900.00000149011304984015, 889.99999940395480280131, 879.99999731779644207563, 869.99999523163808134996, 860.00000059604519719869, 850.00000596045242673426, 839.99999642372858943418, 830.00000178813570528291, 820.00000715254293481848, 809.99999761581898383156, 800.00000298022621336713, 789.99999344350237606704, 779.99999880790949191578, 770.00000417231672145135, 759.99999463559288415127, 750., 739.99999046327616269991, 730.00001072881434538431, 720.00000119209050808422, 709.99999165536667078413, 700.00001192090485346853, 690.00000238418101616844, 679.99999284745706518152, 670.00001311299524786591, 660.00000357627141056582, 649.99999403954757326574, 640.00001430508575595013, 630.00000476836191865004, 619.99999523163808134996, 609.99998569491424404987, 600.00000596045242673426, 589.99999642372858943418, 579.99998688700475213409, 570.00000715254293481848, 559.99999761581898383156, 549.99998807909514653147, 540.00000834463332921587, 529.99999880790949191578, 519.99998927118565461569, 510.00000953672383730009, 500., 489.99999046341827124706, 479.99998092683654249413, 469.99997139025475689778, 460.00002145730883285069, 450.00001192072710409775, 440.00000238421642961839, 429.99999284756376027872, 419.99998331098203152578, 409.99997377440024592943, 400.00002384145437872576, 390.0000143048725931294, 380.00000476829086437647, 369.99999523170913562353, 359.9999856951274068706, 349.99997615854562127424, 340.00002622559975407057, 330.00001668901796847422, 320.00000715243623972128, 309.99999761578357038161, 299.99998807927289590225, 289.99997854269116714931, 280.00002860974524310222, 270.00001907316345750587, 260.00000953658172875294, 250., 239.99999046341827124706, 229.99998092683651407242, 219.99997139025478531948, 210.0000214573088612724, 200.00001192072713251946, 190.00000238421642961839, 179.99999284756376027872, 169.99998331098200310407, 159.99997377440027435114, 150.00002384145435030405, 140.00001430487262155111, 130.00000476829086437647, 119.99999523170913562353, 109.99998569512739265974, 99.99997615854564969595, 90.00002622559972564886, 80.00001668901799689593, 70.00000715243625393214, 59.99999761578356327618, 49.9999880792728816914, 39.9999785426911387276, 30.00002860974522178594, 20.00001907316348237487, 10.00000953658174118743, 0.]
+eff.y_in=[1., 1.]
+eff.WFlo=[0., 9.89999983713030928811, 19.60000080972911007393, 29.10000101044686715568, 38.40000234663407496782, 47.49999932795742552116, 56.40000270336626186918, 65.09999821722479396158, 73.59999997258105963738, 81.89999858617515826609, 89.99999880493207626841, 97.90000198960203192655, 105.60000050722985065477, 113.10000199316723978882, 120.4000010955341792851, 127.49999581576440732533, 134.39999632120142791791, 141.10000491976521175275, 147.60000151154073932958, 153.89999536991737727476, 159.99999820591165189398, 165.89999768615922448589, 171.60000676870052416234, 177.10000384212074209245, 182.3999966752760997224, 187.5, 192.39999845508086195878, 197.10000114674318183461, 201.60000557661004449983, 205.89999738453499844582, 209.99999520779118711289, 213.89999298573641794974, 217.60000866408364572635, 221.10000161883363034576, 224.39999274492998893038, 227.50000177619406827034, 230.3999898624833804206, 233.10000485419985238877, 235.6000072383808117138, 237.89999701502625839566, 239.99999879596788332492, 241.89999453306569421329, 243.60000817533125427872, 245.10000508781217831711, 246.39999417782689761225, 247.50000116824358542544, 248.39999321221833383788, 249.10000617265527012023, 249.60000651115032610505, 249.89999368671894330873, 250., 249.89999368672206969677, 249.6000053024462488338, 249.1000043295944124111, 248.39999557021732812245, 247.50000116822616291756, 246.39999417783107560354, 245.10000508782732708823, 243.6000033998519427314, 241.89998912344603354541, 240.000004720561406657, 237.89999701497978890075, 235.60000723836390079668, 233.10000485421846860845, 230.39998986254346391434, 227.49999279983421729412, 224.40000223624591058069, 221.10001174436092696851, 217.60000866404544694888, 213.89999298572286079434, 209.99999520786261086869, 205.89998484156291169711, 201.60001863446703396221, 197.10001483902797758674, 192.39999845501293407324, 187.5, 182.3999889184312053203, 177.09999576586452008087, 171.59999002472181928169, 165.90000629887177296951, 160.00000712858971496644, 153.89999536993929041273, 147.60000151160920722759, 141.09999505534293007258, 134.39997601064615651012, 127.50001664128856759817, 120.40001179675604703334, 113.10000199311480173492, 105.59999484067850517022, 97.89999033944712891753, 89.99998087919799161227, 81.90002297844029044427, 73.60001245953904458474, 65.10000461092361945248, 56.39999942300008228813, 47.49998924749904460896, 38.3999817422211435769, 29.10002721740288578189, 19.60001865356383277117, 9.90000894530878028377, 0.]
+eff.PEle=[0., 20.20408293513609976344, 40.00000087399897097384, 59.38775763128340656749, 78.36734939229786789383, 96.93877273737177802104, 115.10204555489411859526, 132.85714669251777309, 150.20408936178972680864, 167.14284678382443871669, 183.67345947514371573561, 199.7959146426664176488, 215.51021227908017863228, 230.81633713777409866452, 245.71427829655291930067, 260.20406250569340045331, 274.28571051482958864653, 287.95919558222465184372, 301.224477933454977574, 314.08163752848605554391, 326.53060546942305109042, 338.57144938430860747758, 350.2040724024491282762, 361.42855373456978895774, 372.24490923540486164711, 382.653076171875, 392.65308547504105263215, 402.24489344872796436903, 411.42855727429781609317, 420.20407816350427765428, 428.57143187025013730818, 436.53060727218337433442, 444.08163974717569999484, 451.22447815244265711954, 457.9591956478991505719, 464.28570919137195005533, 470.20406281233800882546, 475.71429188395785558896, 480.8163170133437347431, 485.5101992354337312463, 489.79592649790129144094, 493.67346321320030710922, 497.14285701147178997417, 500.20406897215127628442, 502.85714779094155346684, 505.10205316539457953695, 506.93878034186411696282, 508.36734022900753870999, 509.38775717962391809124, 509.99999957188350663273, 510.204071044921875, 509.99999957188987309564, 509.38775471292177599025, 508.36733646801746999699, 506.93878515384898264529, 505.10205316535905240016, 502.85714779095007997967, 500.20406897218219910428, 497.14284726561044180926, 493.6734521731025893132, 489.79593858901051817156, 485.51019923533891642364, 480.81631701330923078785, 475.71429188399582699276, 470.20406281246067692337, 464.2856908724947970768, 457.95921501771516659574, 451.22449881684013917038, 444.08163974709776766758, 436.53060727215574843285, 428.57143187039588383414, 420.20405256543017458171, 411.42858392358544961098, 402.24492139199372786607, 392.65308547490246837697, 382.653076171875, 372.24489340505994050545, 361.42853725259976727102, 350.20403823163604783986, 338.57146696101779070887, 326.53062367907222096619, 314.08163752853079131455, 301.22447793359469869756, 287.95917545070886944814, 274.28566906481813703067, 260.20410500706196899046, 245.71430013586530094472, 230.81633713766709092852, 215.51020071467974048574, 199.79589086690327803808, 183.6734228919433462579, 167.14289656389982496876, 150.20411484535424051501, 132.85715974081796275641, 115.10203886025861663711, 96.93875216501557190441, 78.36730734248843077694, 59.38781111488125930009, 40.0000372899976213148, 20.20410152325143826602, 0.]
+eff.etaHyd=[0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492]
+eff.etaMot=[0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492, 0.69999998807907104492]
+eff.eta=[0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406, 0.49000000953674316406]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_BaseClasses_Validation_PowerInterface.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_BaseClasses_Validation_PowerInterface.txt
new file mode 100644
index 00000000..41fc7fa1
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_BaseClasses_Validation_PowerInterface.txt
@@ -0,0 +1,12 @@
+last-generated=2016-03-15
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+powCoo.Q_flow=[0., 0., 0., 0., 0., 0.0000000000000832667, 84.00002362489460949746, 311.99999174593523321164, 648.00006883607670715719, 1055.99984687832784402417, 1499.99993298065373892314, 1944.00002552026057855983, 2352.00009939181700246991, 2688.00013206476614868734, 2915.99998950008694009739, 2999.99998941423064025003, 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000., 3000.]
+powNonCoo.WHyd=[1250., 1250.]
+powCoo.WHyd=[1250., 1250.]
+powNonCoo.Q_flow=[0., 0., 0., 0., 0., 0.00000000000000693889, 7.00000196874100399924, 25.99999931216136062062, 54.00000573633972322796, 87.99998723986065840563, 124.9999944150544877175, 162.00000212668987842335, 196.00000828263776497806, 224.00001100537292586523, 242.99999912500422283301, 249.99999911783740458304, 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250., 250.]
+time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_ClosedLoop_y.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_ClosedLoop_y.txt
new file mode 100644
index 00000000..c1cd2185
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_ClosedLoop_y.txt
@@ -0,0 +1,17 @@
+last-generated=2017-05-01
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "0, 1",
+ "number of continuous time states": "6",
+ "linear": " "
+}
+conPID.y=[3.75e-01, 5.64685046672821e-01, 6.758149266242981e-01, 7.204172611236572e-01, 7.383252382278442e-01, 7.455460429191589e-01, 7.484322190284729e-01, 7.495913505554199e-01, 7.500448226928711e-01, 7.502517700195312e-01, 7.503217458724976e-01, 7.503419518470764e-01, 7.503585815429688e-01, 4.353518187999725e-01, 3.241761922836303e-01, 2.79823362827301e-01, 2.624915242195129e-01, 2.558425068855286e-01, 2.533209025859833e-01, 2.523500323295593e-01, 2.519881725311279e-01, 2.518363296985626e-01, 2.517900466918945e-01, 2.5177201628685e-01, 2.517620623111725e-01, 2.517572045326233e-01, 6.337434053421021e-01, 7.035330533981324e-01, 7.315637469291687e-01, 7.428090572357178e-01, 7.473459243774414e-01, 7.490581870079041e-01, 7.499034404754639e-01, 7.501679062843323e-01, 7.502132654190063e-01, 7.503548860549927e-01, 7.503690719604492e-01, 7.50352680683136e-01, 4.352962076663971e-01, 3.241747319698334e-01, 2.798227667808533e-01, 2.624927163124084e-01, 2.558427155017853e-01, 2.533195912837982e-01, 2.523509860038757e-01, 2.519872188568115e-01, 2.518362700939178e-01, 2.517907619476318e-01, 2.5177201628685e-01, 2.517617642879486e-01, 2.517569959163666e-01, 6.337427496910095e-01, 7.035329341888428e-01, 7.315599918365479e-01, 7.428069114685059e-01, 7.473462224006653e-01, 7.490541934967041e-01, 7.499055862426758e-01, 7.50163197517395e-01, 7.502123117446899e-01, 7.50356912612915e-01, 7.503686547279358e-01, 7.503527402877808e-01, 4.352947175502777e-01, 3.241746723651886e-01, 2.798227667808533e-01, 2.624927163124084e-01, 2.558427155017853e-01, 2.533195614814758e-01, 2.523509860038757e-01, 2.519871890544891e-01, 2.518362700939178e-01, 2.517907619476318e-01, 2.5177201628685e-01, 2.517617642879486e-01, 2.517569661140442e-01, 6.337427496910095e-01, 7.035329341888428e-01, 7.315599322319031e-01, 7.428068518638611e-01, 7.473462224006653e-01, 7.490540742874146e-01, 7.499056458473206e-01, 7.501630783081055e-01, 7.502123117446899e-01, 7.50356912612915e-01, 7.503686547279358e-01, 7.503527402877808e-01, 4.352947175502777e-01, 3.241746723651886e-01, 2.798227667808533e-01, 2.624927163124084e-01, 2.558427155017853e-01, 2.533195614814758e-01, 2.523509860038757e-01, 2.519871890544891e-01, 2.518362700939178e-01, 2.517907619476318e-01, 2.517703771591187e-01, 2.517614960670471e-01, 2.517586052417755e-01]
+conPID.u_m=[-1.508126983755867e-13, 5.221319198608398e-01, 6.585119962692261e-01, 7.13261604309082e-01, 7.352257966995239e-01, 7.440887689590454e-01, 7.476233243942261e-01, 7.490518093109131e-01, 7.496024370193481e-01, 7.498558163642883e-01, 7.49947726726532e-01, 7.499757409095764e-01, 7.499886751174927e-01, 4.747814238071442e-01, 3.409380018711089e-01, 2.864519059658051e-01, 2.64262467622757e-01, 2.554715573787689e-01, 2.520992755889893e-01, 2.507991790771484e-01, 2.503113448619843e-01, 2.501071989536285e-01, 2.500454783439636e-01, 2.500209212303162e-01, 2.50007301568985e-01, 2.500007450580597e-01, 6.068529486656189e-01, 6.925554871559144e-01, 7.26909637451172e-01, 7.407853603363037e-01, 7.462727427482605e-01, 7.486861348152161e-01, 7.49338686466217e-01, 7.498049736022949e-01, 7.500442862510681e-01, 7.499175667762756e-01, 7.499589323997498e-01, 7.500140070915222e-01, 4.748959243297577e-01, 3.409370183944702e-01, 2.864542305469513e-01, 2.642615735530853e-01, 2.554735243320465e-01, 2.52097100019455e-01, 2.508006393909454e-01, 2.503100037574768e-01, 2.501071393489838e-01, 2.500464618206024e-01, 2.500208914279938e-01, 2.500069141387939e-01, 2.500004768371582e-01, 6.068539619445801e-01, 6.925527453422546e-01, 7.269073128700256e-01, 7.407860159873962e-01, 7.462767362594604e-01, 7.486920952796936e-01, 7.493381500244141e-01, 7.49813437461853e-01, 7.500452995300293e-01, 7.499140501022339e-01, 7.4996018409729e-01, 7.500138282775879e-01, 4.748988151550293e-01, 3.409369587898254e-01, 2.864542901515961e-01, 2.642615437507629e-01, 2.554735839366913e-01, 2.520970404148102e-01, 2.508006691932678e-01, 2.503099739551544e-01, 2.501071393489838e-01, 2.500464916229248e-01, 2.500208914279938e-01, 2.500068843364716e-01, 2.500004470348358e-01, 6.068539619445801e-01, 6.925526857376099e-01, 7.269072532653809e-01, 7.407860159873962e-01, 7.4627685546875e-01, 7.486922144889832e-01, 7.493381500244141e-01, 7.498136162757874e-01, 7.500452995300293e-01, 7.499139904975891e-01, 7.4996018409729e-01, 7.500138282775879e-01, 4.748988449573517e-01, 3.409369587898254e-01, 2.864542901515961e-01, 2.642615437507629e-01, 2.554735839366913e-01, 2.520970404148102e-01, 2.508006691932678e-01, 2.503099739551544e-01, 2.501071393489838e-01, 2.500464916229248e-01, 2.500185072422028e-01, 2.500066459178925e-01, 2.500027716159821e-01]
+conPID.u_s=[7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01]
+time=[0e+00, 3.6e+03]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_MoverContinuous.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_MoverContinuous.txt
deleted file mode 100644
index 6cefe866..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_MoverContinuous.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-last-generated=2017-05-01
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 1, 1, 1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 0, 1, 1",
- "linear": " "
-}
-pump_y.m_flow=[0e+00, 4.017464083852141e-02, 4.59699484860468e-02, 5.415536902887684e-02, 6.541527180240084e-02, 7.98371124496001e-02, 9.584896481196611e-02, 1.118608410354876e-01, 1.27872738125061e-01, 1.438846381860275e-01, 1.598965650779216e-01, 1.759084919698156e-01, 1.919204188617296e-01, 2.079323606547648e-01, 2.239442905180493e-01, 2.399562054801814e-01, 2.559681592030562e-01, 2.71980103967453e-01, 2.879920189295807e-01, 3.040039875535634e-01, 3.200159323179692e-01, 3.360278711397716e-01, 3.520398159041417e-01, 3.68051760668574e-01, 3.840637292925567e-01, 4.000756442546844e-01, 4.160876128788093e-01, 4.320995337835847e-01, 4.481115024075674e-01, 4.641234710315501e-01, 4.801353919362899e-01, 4.961473307581278e-01, 5.121592993821106e-01, 5.28171220287028e-01, 5.441831889110108e-01, 5.601951575349934e-01, 5.762070784399109e-01, 5.922190470638936e-01, 6.082310156878764e-01, 6.242429843118591e-01, 6.40254905216599e-01, 6.562668738407592e-01, 6.72278842464742e-01, 6.882907037650147e-01, 7.043026723890684e-01, 7.203146410133354e-01, 7.363265619178976e-01, 7.523385305418803e-01, 7.68350499165863e-01, 7.843624200707805e-01, 8.003743886947632e-01, 8.163863573185184e-01, 8.323983259422736e-01, 8.484102945660288e-01, 8.644221677530756e-01, 8.804341363768308e-01, 8.964461050004722e-01, 9.124580736243409e-01, 9.284700422480962e-01, 9.444820108718514e-01, 9.604938840588981e-01, 9.76505852682227e-01, 9.925178213062664e-01, 1.008529789930022e+00, 1.024541758553493e+00, 1.040553727176964e+00, 1.056565600363939e+00, 1.072577568987979e+00, 1.088589537612018e+00, 1.104601506236029e+00, 1.120613474859386e+00, 1.136625443482857e+00, 1.152637316669691e+00, 1.16864928529373e+00, 1.18466125391777e+00, 1.200673222541809e+00, 1.21668519116528e+00, 1.232697159788751e+00, 1.248709128412222e+00, 1.264721001599482e+00, 1.280732970223521e+00, 1.296744938847447e+00, 1.312756788262311e+00, 1.32876875688635e+00, 1.344780725510389e+00, 1.360792598697365e+00, 1.376804567320836e+00, 1.392816535944307e+00, 1.408828504568062e+00, 1.424840473192102e+00, 1.440852441816141e+00, 1.456864315003259e+00, 1.47287628362673e+00, 1.488888252250201e+00, 1.504900220873927e+00, 1.520912189497853e+00, 1.536924158121892e+00, 1.552936031309152e+00, 1.568947999932623e+00, 1.584959968556094e+00, 1.600971937179565e+00]
-pump_Nrpm.m_flow=[0e+00, 4.079784093759504e-02, 4.753518887752266e-02, 5.756009452662184e-02, 7.143276329812263e-02, 8.873258398540762e-02, 1.065235534328043e-01, 1.243145386042879e-01, 1.421055527551738e-01, 1.598965611013239e-01, 1.776875827027884e-01, 1.954786192054186e-01, 2.132696706092011e-01, 2.310607071118268e-01, 2.488517452602949e-01, 2.666427685076551e-01, 2.844338480678466e-01, 3.022248713151979e-01, 3.200159243647649e-01, 3.378069741227761e-01, 3.555980271723699e-01, 3.733891067326057e-01, 3.911801299799748e-01, 4.089711830295685e-01, 4.267622327875797e-01, 4.445532858371735e-01, 4.623443653975071e-01, 4.80135391936361e-01, 4.979264416943899e-01, 5.157175212547057e-01, 5.335085179912372e-01, 5.512996273538932e-01, 5.690906771119044e-01, 5.868816738488267e-01, 6.04672783211092e-01, 6.22463832969103e-01, 6.402548893102793e-01, 6.580459390682906e-01, 6.758369888263017e-01, 6.936280981889578e-01, 7.114190949254893e-01, 7.292102042880385e-01, 7.470012540461564e-01, 7.647922507826879e-01, 7.825833601453439e-01, 8.003744099033551e-01, 8.181654662445313e-01, 8.359565160025425e-01, 8.537475657605537e-01, 8.715386221017301e-01, 8.893296718597412e-01, 9.071207812218601e-01, 9.249118309799027e-01, 9.427028807376612e-01, 9.604938840586851e-01, 9.782849338164434e-01, 9.960760431787202e-01, 1.013867033332173e+00, 1.031658202298511e+00, 1.049449252055985e+00, 1.067240195773856e+00, 1.08503124553133e+00, 1.102822295288804e+00, 1.120613464255568e+00, 1.138404514013042e+00, 1.156195563771937e+00, 1.173986507488388e+00, 1.191777676454157e+00, 1.209568726212199e+00, 1.227359775970226e+00, 1.245150825728284e+00, 1.262941875486327e+00, 1.280732938410504e+00, 1.298523988168546e+00, 1.316315037926589e+00, 1.334106087684631e+00, 1.351897137442674e+00, 1.369688306408869e+00, 1.387479356166343e+00, 1.405270299884215e+00, 1.423061349641689e+00, 1.440852399399037e+00, 1.458643568365927e+00, 1.476434618123401e+00, 1.494225667880875e+00, 1.512016611598746e+00, 1.52980766135622e+00, 1.5475988303227e+00, 1.565389880080458e+00, 1.583180929837932e+00, 1.600971979596828e+00, 1.618762923313278e+00, 1.636554092279047e+00, 1.65434514203709e+00, 1.672136191795116e+00, 1.689927241553175e+00, 1.707718291311217e+00, 1.725509354235394e+00, 1.743300403993436e+00, 1.761091453752047e+00, 1.778882503509521e+00]
-pump_dp.m_flow=[0e+00, 9.328862485460804e-02, 1.838471034664851e-01, 2.691358084246098e-01, 3.469961350539961e-01, 4.158410679565265e-01, 4.748456847303785e-01, 5.241375551932522e-01, 5.649875468258587e-01, 6.000000118431602e-01, 6.324555230465049e-01, 6.633249539146034e-01, 6.928203183035077e-01, 7.211102975030332e-01, 7.483314855800669e-01, 7.745966756901084e-01, 8.000000208337813e-01, 8.246211366071936e-01, 8.485281298378653e-01, 8.717798049166876e-01, 8.944271736095353e-01, 9.165151261969088e-01, 9.380831743802622e-01, 9.591662796570509e-01, 9.797958840925274e-01, 1e+00, 1.019803900312544e+00, 1.039230445202846e+00, 1.058300492890813e+00, 1.077032939167407e+00, 1.095445134296584e+00, 1.113552923681775e+00, 1.131370914685792e+00, 1.148912526157194e+00, 1.166190379676207e+00, 1.183215985821968e+00, 1.200000023808676e+00, 1.216552488106645e+00, 1.232882865047698e+00, 1.24899961851953e+00, 1.264911046128892e+00, 1.280624872064055e+00, 1.296148201171322e+00, 1.311487663792826e+00, 1.326649907841322e+00, 1.341640847790721e+00, 1.356466042599291e+00, 1.371130945035329e+00, 1.385640636655137e+00, 1.399999962520297e+00, 1.414213538169861e+00, 1.428285731305097e+00, 1.442220595080706e+00, 1.456022063415179e+00, 1.469693869926698e+00, 1.483239634637772e+00, 1.496662971168648e+00, 1.50996685974631e+00, 1.523154638251184e+00, 1.536229167720526e+00, 1.549193351457414e+00, 1.562049966601106e+00, 1.574801558156071e+00, 1.587450748724405e+00, 1.600000041708863e+00, 1.612451582894278e+00, 1.624807683109971e+00, 1.637070516209296e+00, 1.649242273233488e+00, 1.66132474232439e+00, 1.673320069245549e+00, 1.685229922946458e+00, 1.697056259747003e+00, 1.708800770355006e+00, 1.720465052955393e+00, 1.732050776481628e+00, 1.743559609854671e+00, 1.754992864396032e+00, 1.766352209039176e+00, 1.777638888044021e+00, 1.788854347244494e+00, 1.799999949665642e+00, 1.811077006604344e+00, 1.822086710164629e+00, 1.833030252444586e+00, 1.843908880108285e+00, 1.854723676505875e+00, 1.865475768696372e+00, 1.876166348768975e+00, 1.886796251192975e+00, 1.897366668069226e+00, 1.907878371388204e+00, 1.918332559342712e+00, 1.928730122775119e+00, 1.939071896149958e+00, 1.949358833139192e+00, 1.959591768219581e+00, 1.969771475339181e+00, 1.979898910319533e+00, 1.989974846787326e+00, 2e+00]
-pump_m_flow.m_flow=[0e+00, 2e-02, 4e-02, 6e-02, 8e-02, 1e-01, 1.2e-01, 1.4e-01, 1.6e-01, 1.8e-01, 2e-01, 2.2e-01, 2.4e-01, 2.6e-01, 2.8e-01, 3e-01, 3.2e-01, 3.4e-01, 3.6e-01, 3.8e-01, 4e-01, 4.2e-01, 4.4e-01, 4.6e-01, 4.8e-01, 5e-01, 5.2e-01, 5.4e-01, 5.600000000000001e-01, 5.8e-01, 6e-01, 6.2e-01, 6.4e-01, 6.6e-01, 6.8e-01, 7e-01, 7.2e-01, 7.4e-01, 7.6e-01, 7.8e-01, 8e-01, 8.2e-01, 8.4e-01, 8.6e-01, 8.8e-01, 9e-01, 9.2e-01, 9.399999999999999e-01, 9.6e-01, 9.8e-01, 1e+00, 1.02e+00, 1.04e+00, 1.06e+00, 1.08e+00, 1.1e+00, 1.12e+00, 1.14e+00, 1.16e+00, 1.18e+00, 1.2e+00, 1.22e+00, 1.24e+00, 1.26e+00, 1.28e+00, 1.3e+00, 1.32e+00, 1.34e+00, 1.36e+00, 1.38e+00, 1.4e+00, 1.42e+00, 1.44e+00, 1.46e+00, 1.48e+00, 1.5e+00, 1.52e+00, 1.54e+00, 1.56e+00, 1.58e+00, 1.6e+00, 1.62e+00, 1.64e+00, 1.66e+00, 1.68e+00, 1.7e+00, 1.72e+00, 1.74e+00, 1.76e+00, 1.78e+00, 1.8e+00, 1.82e+00, 1.84e+00, 1.86e+00, 1.88e+00, 1.9e+00, 1.92e+00, 1.94e+00, 1.96e+00, 1.98e+00, 2e+00]
-time=[0e+00, 1e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_MoverParameter.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_MoverParameter.txt
deleted file mode 100644
index 5e8c7700..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_MoverParameter.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-last-generated=2016-03-11
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 1, 1, 1, 1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-pump_y.m_flow=[1.60097193717956542969, 1.60097193717956542969]
-pump_Nrpm.m_flow=[1.77888250350952148438, 1.77888250350952148438]
-pump_dp.m_flow=[2., 2.]
-pump_m_flow.m_flow=[2., 2.]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_MoverStages.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_MoverStages.txt
deleted file mode 100644
index 3d30edf3..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_MoverStages.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-last-generated=2016-03-11
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 1, 1, 1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 0, 1, 1",
- "linear": " "
-}
-pump_y.m_flow=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 0.80037438869476318359, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969, 1.60097193717956542969]
-pump_Nrpm.m_flow=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 0.88932967185974121094, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438, 1.77888250350952148438]
-pump_dp.m_flow=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 1.41421353816986083984, 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2.]
-pump_m_flow.m_flow=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2., 2.]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_PumpsParallel.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_PumpsParallel.txt
new file mode 100644
index 00000000..74ae6b86
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_PumpsParallel.txt
@@ -0,0 +1,19 @@
+last-generated=2017-05-01
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "2"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "2",
+ "number of continuous time states": "6",
+ "linear": " "
+}
+floMac1.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+time=[0e+00, 3e+02]
+floMac2.dp=[0e+00, -1.166630737304688e+03, -2.483934326171875e+03, -3.253666259765625e+03, -3.64154638671875e+03, -3.827027099609375e+03, -3.9138642578125e+03, -3.953966552734375e+03, -3.972573486328125e+03, -3.980776123046875e+03, -3.98493994140625e+03, -3.98681005859375e+03, -3.9874677734375e+03, -3.987806396484375e+03, -3.988015380859375e+03, -3.988139892578125e+03, -3.988199462890625e+03, -3.988213623046875e+03, -3.988201904296875e+03, -3.98818408203125e+03, -3.98817919921875e+03, -3.988185791015625e+03, -3.988190673828125e+03, -3.9881943359375e+03, -3.988197021484375e+03, -3.98819873046875e+03, -3.98819970703125e+03, -3.9882001953125e+03, -3.988199951171875e+03, -3.988199462890625e+03, -3.98819873046875e+03, -3.98819775390625e+03, -3.988197021484375e+03, -3.9881962890625e+03, -3.988196044921875e+03, -3.988196044921875e+03, -3.98819677734375e+03, -3.988197021484375e+03, -3.988197265625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.98819775390625e+03, -3.98819775390625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.811536376953125e+03, -3.566978759765625e+03, -3.380202392578125e+03, -3.26441015625e+03, -3.22050732421875e+03, -3.202818115234375e+03, -3.19409765625e+03, -3.189880126953125e+03, -3.188457275390625e+03, -3.188063232421875e+03, -3.187958740234375e+03, -3.18793359375e+03, -3.187927001953125e+03, -3.18792529296875e+03, -3.187925048828125e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03]
+floMac1.dp=[0e+00, -1.166630737304688e+03, -2.483934326171875e+03, -3.253666259765625e+03, -3.64154638671875e+03, -3.827027099609375e+03, -3.9138642578125e+03, -3.953966552734375e+03, -3.972573486328125e+03, -3.980776123046875e+03, -3.98493994140625e+03, -3.98681005859375e+03, -3.9874677734375e+03, -3.987806396484375e+03, -3.988015380859375e+03, -3.988139892578125e+03, -3.988199462890625e+03, -3.988213623046875e+03, -3.988201904296875e+03, -3.98818408203125e+03, -3.98817919921875e+03, -3.988185791015625e+03, -3.988190673828125e+03, -3.9881943359375e+03, -3.988197021484375e+03, -3.98819873046875e+03, -3.98819970703125e+03, -3.9882001953125e+03, -3.988199951171875e+03, -3.988199462890625e+03, -3.98819873046875e+03, -3.98819775390625e+03, -3.988197021484375e+03, -3.9881962890625e+03, -3.988196044921875e+03, -3.988196044921875e+03, -3.98819677734375e+03, -3.988197021484375e+03, -3.988197265625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.98819775390625e+03, -3.98819775390625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -2.815909912109375e+03, -1.45440087890625e+03, -7.513909912109375e+02, -4.090593872070312e+02, -2.027254180908203e+02, -9.876827239990172e+01, -4.247188949585004e+01, -1.393373107910156e+01, -4.105989456176758e+00, -1.365517973899841e+00, -6.365277171134949e-01, -4.610525965690613e-01, -4.159055352210999e-01, -4.039783477783203e-01, -4.015378355979919e-01, -4.010682106018066e-01, -4.009103775024414e-01, -4.008558392524719e-01, -4.008404314517975e-01, -4.00838166475296e-01, -4.008381366729736e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.008383452892303e-01, -4.00838315486908e-01, -4.008381962776184e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01]
+floMac2.m_flow=[0e+00, 2.700267136096954e-01, 3.940125703811646e-01, 4.509480595588684e-01, 4.770708978176117e-01, 4.890697300434113e-01, 4.945872128009796e-01, 4.971145987510681e-01, 4.982829093933105e-01, 4.987970590591431e-01, 4.990578591823578e-01, 4.99174952507019e-01, 4.992161095142365e-01, 4.992372989654541e-01, 4.992503821849823e-01, 4.992581903934479e-01, 4.992619156837463e-01, 4.99262809753418e-01, 4.992620944976807e-01, 4.992609620094299e-01, 4.992606341838837e-01, 4.992610812187195e-01, 4.992613792419434e-01, 4.992615878582001e-01, 4.992617666721344e-01, 4.99261885881424e-01, 4.992619454860687e-01, 4.992619752883911e-01, 4.992619454860687e-01, 4.992619156837463e-01, 4.99261885881424e-01, 4.992618262767792e-01, 4.992617666721344e-01, 4.99261736869812e-01, 4.992617070674896e-01, 4.992617070674896e-01, 4.99261736869812e-01, 4.992617666721344e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 5.212469696998596e-01, 5.516817569732666e-01, 5.749257206916809e-01, 5.893358588218689e-01, 5.947995185852051e-01, 5.970008969306946e-01, 5.980861186981201e-01, 5.986109972000122e-01, 5.987880825996399e-01, 5.988370776176453e-01, 5.988501310348511e-01, 5.988532304763794e-01, 5.988540649414062e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01]
+floMac1.m_flow=[0e+00, 2.700267136096954e-01, 3.940125703811646e-01, 4.509480595588684e-01, 4.770708978176117e-01, 4.890697300434113e-01, 4.945872128009796e-01, 4.971145987510681e-01, 4.982829093933105e-01, 4.987970590591431e-01, 4.990578591823578e-01, 4.99174952507019e-01, 4.992161095142365e-01, 4.992372989654541e-01, 4.992503821849823e-01, 4.992581903934479e-01, 4.992619156837463e-01, 4.99262809753418e-01, 4.992620944976807e-01, 4.992609620094299e-01, 4.992606341838837e-01, 4.992610812187195e-01, 4.992613792419434e-01, 4.992615878582001e-01, 4.992617666721344e-01, 4.99261885881424e-01, 4.992619454860687e-01, 4.992619752883911e-01, 4.992619454860687e-01, 4.992619156837463e-01, 4.99261885881424e-01, 4.992618262767792e-01, 4.992617666721344e-01, 4.99261736869812e-01, 4.992617070674896e-01, 4.992617070674896e-01, 4.99261736869812e-01, 4.992617666721344e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 3.837252557277679e-01, 2.007000595331192e-01, 3.165718540549278e-02, -9.644845128059387e-02, -1.530892252922058e-01, -1.777530610561372e-01, -1.90384343266487e-01, -1.966167241334915e-01, -1.987379491329193e-01, -1.993272304534912e-01, -1.994838267564774e-01, -1.995214968919754e-01, -1.995311975479126e-01, -1.995337605476379e-01, -1.995342820882797e-01, -1.995343863964081e-01, -1.995344161987305e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_PumpsSeries.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_PumpsSeries.txt
new file mode 100644
index 00000000..7adb5dfc
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_PumpsSeries.txt
@@ -0,0 +1,19 @@
+last-generated=2016-09-08
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "number of continuous time states": "4",
+ "linear": " "
+}
+floMac1.y=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+time=[0., 300.]
+floMac2.dp=[-2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2862.145263671875, -3891.115478515625, -4346.4189453125, -4392.7900390625, -4291.26123046875, -4181.1899414062490905053, -4086.7663574218759094947, -4029.310791015625, -4008.77734375, -4003.042236328125, -4001.494873046875, -4001.125, -4001.03271484375, -4001.0068359375, -4001.0009765625, -4001., -4001., -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375, -4000.999755859375]
+floMac1.dp=[-2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -2000., -1137.854736328125, -108.8845977783203125, 346.419097900390625, 392.7901611328125, 291.261383056640625, 181.18975830078036892701, 86.76626586914144922957, 29.310779571533203125, 8.77738094329833984375, 3.04216885566711425781, 1.49479150772094726562, 1.12499260902404785156, 1.03272998332977294922, 1.00688946247100830078, 1.00107026100158691406, 1.00008940696716308594, 0.99989545345306396484, 0.99979799985885620117, 0.99976199865341186523, 0.99975150823593139648, 0.99975007772445678711, 0.99975037574768066406, 0.99975037574768066406, 0.9997501373291015625, 0.99975007772445678711, 0.99975025653839111328, 0.99975019693374633789, 0.9997501373291015625, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711, 0.99975007772445678711]
+floMac2.m_flow=[-995.58599853515625, 0.07832604646682739258, 0.47036466002464294434, 0.62368750572204589844, 0.69092398881912231445, 0.72117906808853149414, 0.73501092195510864258, 0.74133259057998657227, 0.74425601959228515625, 0.74552446603775024414, 0.74617218971252441406, 0.74647980928421020508, 0.74658638238906860352, 0.7466284632682800293, 0.74665725231170654297, 0.74667620658874511719, 0.74668711423873901367, 0.74669188261032104492, 0.74669235944747924805, 0.74669045209884643555, 0.74668800830841064453, 0.7466869354248046875, 0.74668776988983154297, 0.74668842554092407227, 0.74668890237808227539, 0.74668931961059570312, 0.74668955802917480469, 0.74668973684310913086, 0.74668985605239868164, 0.74668985605239868164, 0.74668985605239868164, 0.74668979644775390625, 0.74668967723846435547, 0.74668955802917480469, 0.74668943881988525391, 0.74668937921524047852, 0.74668931961059570312, 0.74668931961059570312, 0.74668931961059570312, 0.74668937921524047852, 0.74668943881988525391, 0.7466894984245300293, 0.7466894984245300293, 0.7466894984245300293, 0.7466894984245300293, 0.7466894984245300293, 0.7466894984245300293, 0.7466894984245300293, 0.7466894984245300293, 0.7466894984245300293, 0.7466894984245300293, 0.63939702510833740234, 0.51134347915649414062, 0.45468175411224365234, 0.44891095161437988281, 0.46154603362083435059, 0.47524425387382518426, 0.48699510097503651007, 0.49414533376693725586, 0.49670067429542541504, 0.49741441011428833008, 0.49760696291923522949, 0.49765300750732421875, 0.49766448140144348145, 0.49766770005226135254, 0.49766841530799865723, 0.49766853451728820801, 0.4976685643196105957, 0.4976685643196105957, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834]
+floMac1.m_flow=[-995.58599853515625, 0.07832604646682739258, 0.47036466002464294434, 0.62368750572204589844, 0.69092398881912231445, 0.72117906808853149414, 0.73501092195510864258, 0.74133259057998657227, 0.74425601959228515625, 0.74552446603775024414, 0.74617218971252441406, 0.74647980928421020508, 0.74658638238906860352, 0.7466284632682800293, 0.74665725231170654297, 0.74667620658874511719, 0.74668711423873901367, 0.74669188261032104492, 0.74669235944747924805, 0.74669045209884643555, 0.74668800830841064453, 0.7466869354248046875, 0.74668776988983154297, 0.74668842554092407227, 0.74668890237808227539, 0.74668931961059570312, 0.74668955802917480469, 0.74668973684310913086, 0.74668985605239868164, 0.74668985605239868164, 0.74668985605239868164, 0.74668979644775390625, 0.74668967723846435547, 0.74668955802917480469, 0.74668943881988525391, 0.74668937921524047852, 0.74668931961059570312, 0.74668931961059570312, 0.74668931961059570312, 0.74668937921524047852, 0.74668943881988525391, 0.7466894984245300293, 0.7466894984245300293, 0.7466894984245300293, 0.7466894984245300293, 0.7466894984245300293, 0.7466894984245300293, 0.7466894984245300293, 0.7466894984245300293, 0.7466894984245300293, 0.7466894984245300293, 0.63939702510833740234, 0.51134347915649414062, 0.45468175411224365234, 0.44891095161437988281, 0.46154603362083435059, 0.47524425387382518426, 0.48699510097503651007, 0.49414533376693725586, 0.49670067429542541504, 0.49741441011428833008, 0.49760696291923522949, 0.49765300750732421875, 0.49766448140144348145, 0.49766770005226135254, 0.49766841530799865723, 0.49766853451728820801, 0.4976685643196105957, 0.4976685643196105957, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834, 0.4976685941219329834]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_SpeedControlled_y_pumpCurves.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_SpeedControlled_y_pumpCurves.txt
new file mode 100644
index 00000000..4bb1af06
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Examples_SpeedControlled_y_pumpCurves.txt
@@ -0,0 +1,17 @@
+last-generated=2017-05-01
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 1, 1",
+ "linear": " "
+}
+pum.dpMachine=[3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.101064453125e+02, 3.224293639734723e+02, 3.354923562578733e+02, 3.49355161881689e+02, 3.640834478083012e+02, 3.797497672317646e+02, 3.964343220919628e+02, 4.142259043442196e+02, 4.332229663666558e+02, 4.535351793051347e+02, 4.752844983757985e+02, 4.986071739377334e+02, 5.236557494266266e+02, 5.5060120971958e+02, 5.796357246128603e+02, 6.109759328848331e+02, 6.448667119287671e+02, 6.815851335585533e+02, 7.214460764881529e+02, 7.648084215254855e+02, 8.120816023589975e+02, 8.637348186129635e+02, 9.203076853501698e+02, 9.82421762431705e+02, 1.050795830660637e+03, 1.126264282226562e+03, 1.20979830251188e+03, 1.302532292972388e+03, 1.40579609177985e+03, 1.521153183573669e+03, 1.650451132572398e+03, 1.795876062281661e+03, 1.96002600528793e+03, 2.146201507786306e+03, 2.358736199945169e+03, 2.602468624293952e+03, 2.883203432410699e+03, 3.207848712894117e+03, 3.584459180679342e+03, 4.021996045281593e+03, 4.529382176696842e+03, 5.112789893317643e+03, 5.768481286748787e+03, 6.479891073752518e+03, 7.249133976149566e+03, 8.018294797819109e+03, 8.63523620219602e+03, 8.882530894124386e+03, 9.010170517663397e+03, 9.242283951326413e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03, 9.4871630859375e+03]
+time=[0e+00, 1e+00]
+pum1.dpMachine=[7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 7.750687408447266e+01, 8.058684843892955e+01, 8.385180305458562e+01, 8.731664996759714e+01, 9.099782880922147e+01, 9.491345499271725e+01, 9.908358662675188e+01, 1.035304140735449e+02, 1.082785428017107e+02, 1.133553829614995e+02, 1.187914309896154e+02, 1.246207189625267e+02, 1.308813903603139e+02, 1.376161837767873e+02, 1.448731340314551e+02, 1.527063703073061e+02, 1.611771272002324e+02, 1.703546726689636e+02, 1.803176653639097e+02, 1.911558254735446e+02, 2.029715114264099e+02, 2.158820078783801e+02, 2.300221880608024e+02, 2.455474266881453e+02, 2.626373426784173e+02, 2.815006103515625e+02, 3.023799039928907e+02, 3.255588239664968e+02, 3.513697992973073e+02, 3.802036706610635e+02, 4.125222985312348e+02, 4.488721222614328e+02, 4.899026499983846e+02, 5.364400864090467e+02, 5.895671676428652e+02, 6.504928885135527e+02, 7.206683507906794e+02, 8.018205156303841e+02, 8.959628786605451e+02, 1.005335376048593e+03, 1.132168542186162e+03, 1.278004846419504e+03, 1.441909140079168e+03, 1.619749135630868e+03, 1.812054123919185e+03, 2.004343108638103e+03, 2.158585417778414e+03, 2.220445711665665e+03, 2.252416652734608e+03, 2.310504825664022e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03, 2.372738037109375e+03]
+pum2.dpMachine=[7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 7.715288996696472e-01, 8.021930758920304e-01, 8.346991778019031e-01, 8.691959935031919e-01, 9.058471639335148e-01, 9.44833111803146e-01, 9.863537448439735e-01, 1.030630025412241e+00, 1.07790726018493e+00, 1.128458362127172e+00, 1.182587299597887e+00, 1.240633163880605e+00, 1.30297610084529e+00, 1.370041880657698e+00, 1.442309368543144e+00, 1.520317983361577e+00, 1.604677947211108e+00, 1.696079856823631e+00, 1.795307801319729e+00, 1.903256443409193e+00, 2.02094617370919e+00, 2.149546512018047e+00, 2.290402430161314e+00, 2.445063766643684e+00, 2.615322421098541e+00, 2.803259611129761e+00, 3.011297436999095e+00, 3.242265693918637e+00, 3.49948246370707e+00, 3.786849807673606e+00, 4.108979299937786e+00, 4.471329121609274e+00, 4.880387144405071e+00, 5.344631079130777e+00, 5.87469537760678e+00, 6.482621568797188e+00, 7.182898414898301e+00, 7.992770262565152e+00, 8.932336343331267e+00, 1.002395419057097e+01, 1.12898668731021e+01, 1.274541453041801e+01, 1.438110068418856e+01, 1.61573072599736e+01, 1.807929276491323e+01, 2.000195144231548e+01, 2.154564117271345e+01, 2.217081168910143e+01, 2.250152871900549e+01, 2.313174371402464e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01, 2.37475471496582e+01]
+pum3.dpMachine=[1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.670900136232376e-01, 1.727843191489342e-01, 1.787610137647357e-01, 1.850381187913717e-01, 1.916349735956464e-01, 1.985723291888448e-01, 2.05872563731429e-01, 2.135596630075858e-01, 2.216594557779625e-01, 2.301997362172027e-01, 2.392102684417375e-01, 2.48723016183298e-01, 2.587723086964885e-01, 2.693947606007221e-01, 2.8062956207304e-01, 2.925182210441447e-01, 3.051049457880287e-01, 3.184360744702192e-01, 3.32560141477678e-01, 3.475273288477748e-01, 3.633887069469098e-01, 3.801951562910666e-01, 3.979958317777336e-01, 4.16835626998534e-01, 4.367517336811029e-01, 4.577687978744507e-01, 4.798912325166516e-01, 5.030931092689155e-01, 5.273024552144481e-01, 5.52379136474739e-01, 5.782811923567753e-01, 6.053222352295801e-01, 6.334329452683043e-01, 6.624574557108843e-01, 6.92150432918914e-01, 7.221445918061874e-01, 7.519099886243664e-01, 7.807004913441062e-01, 8.074895858839254e-01, 8.308033634442862e-01, 8.484902124333144e-01, 8.606217832605098e-01, 8.686296825180856e-01, 8.749474241312561e-01, 8.830079462494548e-01, 8.953807513587007e-01, 9.092412305310947e-01, 9.238173545663464e-01, 9.372342591574891e-01, 9.465503028832823e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01, 9.499905705451965e-01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_ControlledFlowMachine.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_ControlledFlowMachine.txt
new file mode 100644
index 00000000..6f3b0567
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_ControlledFlowMachine.txt
@@ -0,0 +1,22 @@
+last-generated=2017-05-01
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 1, 1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 0, 1, 1",
+ "number of continuous time states": "14",
+ "linear": " "
+}
+fan2.m_flow=[0e+00, 3.502131905406713e-03, 4.243301227688789e-03, 4.399053752422333e-03, 4.431899636983871e-03, 4.438810516148806e-03, 4.440258257091045e-03, 4.440575372427702e-03, 4.440641030669212e-03, 4.440658260136843e-03, 4.440656863152981e-03, 2.393386326730251e-03, 6.905702757649124e-04, 8.986003376776353e-05, 6.761248641851092e-06, 4.464330061182409e-07, 2.751798255928861e-08, 1.625880319267017e-09, 9.84317072294516e-11, 5.624611887355968e-12, 7.029932191926491e-13, 2.047189045697451e-03, 3.628844628110528e-03, 4.204779397696257e-03, 4.377282690256834e-03, 4.424411337822676e-03, 4.436610266566277e-03, 4.439669195562601e-03, 4.440418910235167e-03, 4.440599121153355e-03, 4.440640099346638e-03, 2.393382601439953e-03, 6.905692862346768e-04, 8.985988097265363e-05, 6.76123909215669e-06, 4.464333756004635e-07, 2.751798255928861e-08, 1.625880319267026e-09, 9.84317072294516e-11, 5.976108496952293e-12, 0e+00, 2.047189045697439e-03, 3.628844628110528e-03, 4.204779397696257e-03, 4.377282690256834e-03, 4.424411337822676e-03, 4.436610266566277e-03, 4.439669195562601e-03, 4.440418910235167e-03, 4.440599121153355e-03, 4.440640099346638e-03, 2.393382601439953e-03, 6.905692862346768e-04, 8.985987369669601e-05, 6.761239546904108e-06, 4.464316134544788e-07, 2.751833427794225e-08, 1.626232037921286e-09, 9.772849196565403e-11, 4.921618668163319e-12, 7.029932191926491e-13, 2.047189045697451e-03, 3.628844628110528e-03, 4.204779397696257e-03, 4.377282690256834e-03, 4.424411337822676e-03, 4.436610266566277e-03, 4.439669195562601e-03, 4.440418910235167e-03, 4.440599121153355e-03, 4.440640099346638e-03, 2.393382601439953e-03, 6.905692862346768e-04, 8.985987369669601e-05, 6.761239092156757e-06, 4.464326650577277e-07, 2.751833427794281e-08, 1.625880319267026e-09, 9.702549874646138e-11, 5.976108496952293e-12, 7.029932191926491e-13, 2.047189045697471e-03, 3.628844628110518e-03, 4.204779397696257e-03, 4.377282690256834e-03, 4.424411337822676e-03, 4.436610266566277e-03, 4.439669195562601e-03, 4.440418910235167e-03, 4.440599121153355e-03, 4.440640099346638e-03, 2.393382601439953e-03, 6.905692862346768e-04, 8.985987369669601e-05, 6.761239092156757e-06, 4.464316134544788e-07, 2.751763084063441e-08, 1.625880319267026e-09, 9.667400213686506e-11, 5.624611887355968e-12, 3.514966095963246e-13]
+fan1.m_flow=[1.931788062847772e-14, 3.502123756334186e-03, 4.243333823978901e-03, 4.399060737341642e-03, 4.431901033967733e-03, 4.438810516148806e-03, 4.440258257091045e-03, 4.440575372427702e-03, 4.440641030669212e-03, 4.440658260136843e-03, 4.440656863152981e-03, 2.393148140981793e-03, 6.904806359671056e-04, 8.986440661828965e-05, 6.7596624830912e-06, 4.462540346139576e-07, 2.751070127260391e-08, 1.625310330766175e-09, 1.007303129796355e-10, 5.319966689398825e-12, 6.818989817247711e-13, 2.047441899776459e-03, 3.628945210948586e-03, 4.204811528325081e-03, 4.377291537821293e-03, 4.424413666129112e-03, 4.436610732227564e-03, 4.439669195562601e-03, 4.440418910235167e-03, 4.440599121153355e-03, 4.440640099346638e-03, 2.393144182860851e-03, 6.904795300215483e-04, 8.986426109913737e-05, 6.759652478649447e-06, 4.462526987936144e-07, 2.750805094819953e-08, 1.624647749665087e-09, 9.874256967634665e-11, 5.319966689398825e-12, -1.305844321564109e-12, 2.047441899776447e-03, 3.628945210948586e-03, 4.204811528325081e-03, 4.377291537821293e-03, 4.424413666129112e-03, 4.436610732227564e-03, 4.439669195562601e-03, 4.440418910235167e-03, 4.440599121153355e-03, 4.440640099346638e-03, 2.393144182860851e-03, 6.904795882292092e-04, 8.986425382317975e-05, 6.759649750165408e-06, 4.462566778329347e-07, 2.751003869150225e-08, 1.623985168564049e-09, 9.741762951875899e-11, 5.982547790495119e-12, 6.818989817247711e-13, 2.047441899776459e-03, 3.628945210948586e-03, 4.204811528325081e-03, 4.377291537821293e-03, 4.424413666129112e-03, 4.436610732227564e-03, 4.439669195562601e-03, 4.440418910235167e-03, 4.440599121153355e-03, 4.440640099346638e-03, 2.393144182860851e-03, 6.904795882292092e-04, 8.986424654722214e-05, 6.759652023902163e-06, 4.462546883132745e-07, 2.750805094819953e-08, 1.625310330766183e-09, 1.007303129796355e-10, 5.982547790495119e-12, 1.931788062847772e-14, 2.047441899776479e-03, 3.628945210948576e-03, 4.204811528325081e-03, 4.377291537821293e-03, 4.424413666129112e-03, 4.436610732227564e-03, 4.439669195562601e-03, 4.440418910235167e-03, 4.440599121153355e-03, 4.440640099346638e-03, 2.393144182860851e-03, 6.904797628521919e-04, 8.986425382317975e-05, 6.759652023902163e-06, 4.462546883132745e-07, 2.751003869150281e-08, 1.625310330766183e-09, 1.007303129796355e-10, 5.319966689398825e-12, 6.818989817247711e-13]
+fan3.m_flow=[0e+00, 3.502131905406713e-03, 4.243301227688789e-03, 4.399053752422333e-03, 4.431899636983871e-03, 4.438810516148806e-03, 4.440258257091045e-03, 4.440575372427702e-03, 4.440641030669212e-03, 4.440658260136843e-03, 4.440656863152981e-03, 2.393386326730251e-03, 6.905703339725733e-04, 8.986003376776353e-05, 6.761249096598443e-06, 4.464322955755051e-07, 2.751721694949083e-08, 1.626176526769987e-09, 9.686118573881686e-11, 6.366462912410498e-12, 4.547473508864641e-13, 2.047189045697451e-03, 3.628844628110528e-03, 4.204779397696257e-03, 4.377282690256834e-03, 4.424411337822676e-03, 4.436610266566277e-03, 4.439669195562601e-03, 4.440418910235167e-03, 4.440599121153355e-03, 4.440640099346638e-03, 2.393382601439953e-03, 6.905692280270159e-04, 8.98598664207384e-05, 6.761239546904041e-06, 4.464332050702069e-07, 2.75181264441926e-08, 1.626176526769996e-09, 9.640643838793039e-11, 5.911715561524034e-12, 9.094947017729282e-13, 2.047189045697439e-03, 3.628844628110528e-03, 4.204779397696257e-03, 4.377282690256834e-03, 4.424411337822676e-03, 4.436610266566277e-03, 4.439669195562601e-03, 4.440418910235167e-03, 4.440599121153355e-03, 4.440640099346638e-03, 2.393382601439953e-03, 6.905692862346768e-04, 8.985987369669601e-05, 6.761239546904108e-06, 4.464300218387507e-07, 2.751812644419204e-08, 1.625721779419168e-09, 9.868017514236271e-11, 5.002220859751105e-12, 0e+00, 2.047189045697451e-03, 3.628844628110528e-03, 4.204779397696257e-03, 4.377282690256834e-03, 4.424411337822676e-03, 4.436610266566277e-03, 4.439669195562601e-03, 4.440418910235167e-03, 4.440599121153355e-03, 4.440640099346638e-03, 2.393382601439953e-03, 6.905692862346768e-04, 8.985987369669601e-05, 6.761239546904108e-06, 4.464313860808033e-07, 2.75181264441926e-08, 1.625721779419109e-09, 9.686118573881686e-11, 5.456968210637569e-12, 0e+00, 2.047189045697471e-03, 3.628844628110518e-03, 4.204779397696257e-03, 4.377282690256834e-03, 4.424411337822676e-03, 4.436610266566277e-03, 4.439669195562601e-03, 4.440418910235167e-03, 4.440599121153355e-03, 4.440640099346638e-03, 2.393382601439953e-03, 6.905692862346768e-04, 8.98598664207384e-05, 6.761239092156757e-06, 4.464309313334525e-07, 2.751721694949083e-08, 1.626631274120882e-09, 1.000444171950221e-10, 5.911715561524034e-12, 4.547473508864641e-13]
+fan4.m_flow=[0e+00, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 5.456968210637569e-12, -1.045918907038867e-11, 4.092726157978177e-12, 0e+00, 0e+00, 0e+00, -4.547473508864587e-13, -2.728484105318785e-12, 4.547473508864641e-13, 4.547473508864641e-13, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 1.364242052659392e-12, 1.728039933368564e-11, 8.185452315956354e-12, 4.547473508864534e-13, -1.818989403545856e-12, 0e+00, 0e+00, 2.728484105318785e-12, 0e+00, 0e+00, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 1.364242052659392e-12, 1.728039933368564e-11, 8.185452315956354e-12, -4.547473508864641e-13, 3.183231456205249e-12, -4.547473508864426e-13, -2.150750371994567e-26, -4.092726157978177e-12, -4.547473508864641e-13, 4.547473508864641e-13, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 0e+00, 0e+00, 0e+00, 0e+00, 4.547473508864641e-13, 0e+00, 0e+00, -2.728484105318785e-12, -1.364242052659392e-12, 0e+00, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 5.911715561524034e-12, -3.956301952712238e-11, -2.728484105318785e-12, 0e+00, 2.728484105318785e-12, 4.547473508864641e-13, 4.547473508864641e-13, 0e+00, 0e+00, 0e+00]
+time=[0e+00, 6e+02]
+fan2.dp=[0e+00, -1.70582109375e+04, -2.500826953125e+04, -2.6877552734375e+04, -2.728034765625e+04, -2.73654765625e+04, -2.7383328125e+04, -2.738723828125e+04, -2.7388048828125e+04, -2.7388263671875e+04, -2.738824609375e+04, -7.95445849609375e+03, -8.325242919921875e+02, -8.445524597167969e+01, -6.336817264556854e+00, -4.173799157142639e-01, -2.575518749654293e-02, -1.519016921520225e-03, -8.690597314853221e-05, -5.439418600872159e-06, -2.518499968573451e-07, -5.82060595703125e+03, -1.8290734375e+04, -2.455630078125e+04, -2.6612197265625e+04, -2.7188248046875e+04, -2.7338357421875e+04, -2.73760625e+04, -2.738530859375e+04, -2.738753125e+04, -2.73880390625e+04, -7.9544326171875e+03, -8.325224609375e+02, -8.445510864257812e+01, -6.336807727813659e+00, -4.173793494701385e-01, -2.575515583157539e-02, -1.519015291705728e-03, -8.690592949278653e-05, -5.439418600872159e-06, -2.518499968573451e-07, -5.820605957031193e+03, -1.8290734375e+04, -2.455630078125e+04, -2.6612197265625e+04, -2.7188248046875e+04, -2.7338357421875e+04, -2.73760625e+04, -2.738530859375e+04, -2.738753125e+04, -2.73880390625e+04, -7.9544326171875e+03, -8.325224609375e+02, -8.445510864257812e+01, -6.336807727813721e+00, -4.173793494701385e-01, -2.575515583157487e-02, -1.519015291705783e-03, -8.690592949278653e-05, -5.439389497041702e-06, -2.518499968573451e-07, -5.82060595703125e+03, -1.8290734375e+04, -2.455630078125e+04, -2.6612197265625e+04, -2.7188248046875e+04, -2.7338357421875e+04, -2.73760625e+04, -2.738530859375e+04, -2.738753125e+04, -2.73880390625e+04, -7.9544326171875e+03, -8.325224609375e+02, -8.445510864257812e+01, -6.336807727813721e+00, -4.173793494701385e-01, -2.575515583157539e-02, -1.519015175290406e-03, -8.690584218129516e-05, -5.439418600872159e-06, -2.518645487725735e-07, -5.820605957031377e+03, -1.82907343749999e+04, -2.455630078125e+04, -2.6612197265625e+04, -2.7188248046875e+04, -2.7338357421875e+04, -2.73760625e+04, -2.738530859375e+04, -2.738753125e+04, -2.73880390625e+04, -7.9544326171875e+03, -8.325224609375e+02, -8.445510864257812e+01, -6.336807727813721e+00, -4.173793494701385e-01, -2.575515583157539e-02, -1.519015175290406e-03, -8.690584218129516e-05, -5.439404048956931e-06, -2.713059075176716e-07]
+fan1.dp=[0e+00, -1.70582109375e+04, -2.500826953125e+04, -2.6877552734375e+04, -2.728034765625e+04, -2.73654765625e+04, -2.7383328125e+04, -2.738723828125e+04, -2.7388048828125e+04, -2.7388263671875e+04, -2.738824609375e+04, -7.95445849609375e+03, -1.2660712890625e+03, -1.594395599365234e+02, -1.201598453521723e+01, -7.914630770683289e-01, -4.883867502212524e-02, -2.880459418520317e-03, -1.647967583267018e-04, -1.031458668876439e-05, -4.775356501340866e-07, -5.82060595703125e+03, -1.8290734375e+04, -2.455630078125e+04, -2.6612197265625e+04, -2.7188248046875e+04, -2.7338357421875e+04, -2.73760625e+04, -2.738530859375e+04, -2.738753125e+04, -2.73880390625e+04, -7.9544326171875e+03, -1.2660693359375e+03, -1.594393005371094e+02, -1.201596736907947e+01, -7.914620637893677e-01, -4.883861914277077e-02, -2.880456391721964e-03, -1.647965837037191e-04, -1.031457213684916e-05, -4.775356501340866e-07, -5.820605957031194e+03, -1.8290734375e+04, -2.455630078125e+04, -2.6612197265625e+04, -2.7188248046875e+04, -2.7338357421875e+04, -2.73760625e+04, -2.738530859375e+04, -2.738753125e+04, -2.73880390625e+04, -7.9544326171875e+03, -1.2660693359375e+03, -1.594393005371094e+02, -1.201596736907959e+01, -7.914620637893677e-01, -4.883861914276977e-02, -2.880456391722068e-03, -1.647965837037191e-04, -1.031457213684916e-05, -4.775356501340866e-07, -5.82060595703125e+03, -1.8290734375e+04, -2.455630078125e+04, -2.6612197265625e+04, -2.7188248046875e+04, -2.7338357421875e+04, -2.73760625e+04, -2.738530859375e+04, -2.738753125e+04, -2.73880390625e+04, -7.9544326171875e+03, -1.2660693359375e+03, -1.594393005371094e+02, -1.201596736907959e+01, -7.914620637893677e-01, -4.883861914277077e-02, -2.880456391721964e-03, -1.647965837037191e-04, -1.031457213684916e-05, -4.775356501340866e-07, -5.820605957031377e+03, -1.82907343749999e+04, -2.455630078125e+04, -2.6612197265625e+04, -2.7188248046875e+04, -2.7338357421875e+04, -2.73760625e+04, -2.738530859375e+04, -2.738753125e+04, -2.73880390625e+04, -7.9544326171875e+03, -1.2660693359375e+03, -1.594393005371094e+02, -1.201596736907959e+01, -7.914620637893677e-01, -4.883861914277077e-02, -2.880456391721964e-03, -1.647965837037191e-04, -1.031457213684916e-05, -5.1448296289891e-07]
+fan3.dp=[0e+00, -1.70582109375e+04, -2.500826953125e+04, -2.6877552734375e+04, -2.728034765625e+04, -2.73654765625e+04, -2.7383328125e+04, -2.738723828125e+04, -2.7388048828125e+04, -2.7388263671875e+04, -2.738824609375e+04, -7.95445849609375e+03, -1.2660712890625e+03, -1.594395599365234e+02, -1.201598453521723e+01, -7.914630770683289e-01, -4.883867502212524e-02, -2.880459418520317e-03, -1.647967583267018e-04, -1.031458668876439e-05, -4.775356501340866e-07, -5.82060595703125e+03, -1.8290734375e+04, -2.455630078125e+04, -2.6612197265625e+04, -2.7188248046875e+04, -2.7338357421875e+04, -2.73760625e+04, -2.738530859375e+04, -2.738753125e+04, -2.73880390625e+04, -7.9544326171875e+03, -1.2660693359375e+03, -1.594393005371094e+02, -1.201596736907947e+01, -7.914620637893677e-01, -4.883861914277077e-02, -2.880456391721964e-03, -1.647965837037191e-04, -1.031457213684916e-05, -4.775356501340866e-07, -5.820605957031194e+03, -1.8290734375e+04, -2.455630078125e+04, -2.6612197265625e+04, -2.7188248046875e+04, -2.7338357421875e+04, -2.73760625e+04, -2.738530859375e+04, -2.738753125e+04, -2.73880390625e+04, -7.9544326171875e+03, -1.2660693359375e+03, -1.594393005371094e+02, -1.201596736907959e+01, -7.914620637893677e-01, -4.883861914276977e-02, -2.880456391722068e-03, -1.647965837037191e-04, -1.031457213684916e-05, -4.775356501340866e-07, -5.82060595703125e+03, -1.8290734375e+04, -2.455630078125e+04, -2.6612197265625e+04, -2.7188248046875e+04, -2.7338357421875e+04, -2.73760625e+04, -2.738530859375e+04, -2.738753125e+04, -2.73880390625e+04, -7.9544326171875e+03, -1.2660693359375e+03, -1.594393005371094e+02, -1.201596736907959e+01, -7.914620637893677e-01, -4.883861914277077e-02, -2.880456391721964e-03, -1.647965837037191e-04, -1.031457213684916e-05, -4.775356501340866e-07, -5.820605957031377e+03, -1.82907343749999e+04, -2.455630078125e+04, -2.6612197265625e+04, -2.7188248046875e+04, -2.7338357421875e+04, -2.73760625e+04, -2.738530859375e+04, -2.738753125e+04, -2.73880390625e+04, -7.9544326171875e+03, -1.2660693359375e+03, -1.594393005371094e+02, -1.201596736907959e+01, -7.914620637893677e-01, -4.883861914277077e-02, -2.880456391721964e-03, -1.647965837037191e-04, -1.031457213684916e-05, -5.1448296289891e-07]
+fan4.dp=[-2.7388189453125e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt
new file mode 100644
index 00000000..a9b5db17
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt
@@ -0,0 +1,22 @@
+last-generated=2017-05-01
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 1, 1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 0, 1, 1",
+ "number of continuous time states": "20",
+ "linear": " "
+}
+fan2.m_flow=[0e+00, 8.985302411019802e-04, 2.66596581786871e-03, 3.749054158106446e-03, 4.206694662570953e-03, 4.368272610008717e-03, 4.419588949531317e-03, 4.434789996594191e-03, 4.439076408743858e-03, 4.440237302333117e-03, 4.440546501427889e-03, 4.116575233638287e-03, 2.748811617493629e-03, 1.307156635448337e-03, 4.752042877953488e-04, 1.460426137782633e-04, 4.070813156431541e-05, 1.068860001396385e-05, 2.698293656067108e-06, 6.628927167184884e-07, 1.596220897681633e-07, 2.83597590168938e-04, 1.656124833971262e-03, 3.036698792129755e-03, 3.851991845294833e-03, 4.222494084388018e-03, 4.366545472294092e-03, 4.417045507580042e-03, 4.433494992554188e-03, 4.438562784343958e-03, 4.440061282366514e-03, 4.116439260542393e-03, 2.748774364590645e-03, 1.307146623730659e-03, 4.752016393467761e-04, 1.460419443901628e-04, 4.070796785526909e-05, 1.06885590867023e-05, 2.698283651625388e-06, 6.628895334870322e-07, 1.596213792254275e-07, 2.835975901689345e-04, 1.656124833971262e-03, 3.036698792129755e-03, 3.851991845294833e-03, 4.222494084388018e-03, 4.366545472294092e-03, 4.417045507580042e-03, 4.433494992554188e-03, 4.438562784343958e-03, 4.440061282366514e-03, 4.116439260542393e-03, 2.748774364590645e-03, 1.307146623730659e-03, 4.752016393467784e-04, 1.460419443901628e-04, 4.070796785526864e-05, 1.068855908670246e-05, 2.698283651625388e-06, 6.628902724514774e-07, 1.596213792254275e-07, 2.83597590168938e-04, 1.656124833971262e-03, 3.036698792129755e-03, 3.851991845294833e-03, 4.222494084388018e-03, 4.366545472294092e-03, 4.417045507580042e-03, 4.433494992554188e-03, 4.438562784343958e-03, 4.440061282366514e-03, 4.116439260542393e-03, 2.748774364590645e-03, 1.307146623730659e-03, 4.752016393467784e-04, 1.460419443901628e-04, 4.070796785526909e-05, 1.06885590867023e-05, 2.698284333746415e-06, 6.628895334870322e-07, 1.596213792254275e-07, 2.83597590168948e-04, 1.656124833971247e-03, 3.036698792129755e-03, 3.851991845294833e-03, 4.222494084388018e-03, 4.366545472294092e-03, 4.417045507580042e-03, 4.433494992554188e-03, 4.438562784343958e-03, 4.440061282366514e-03, 4.116439260542393e-03, 2.748774364590645e-03, 1.307146623730659e-03, 4.752016393467784e-04, 1.460419443901628e-04, 4.070796785526909e-05, 1.06885590867023e-05, 2.698283424251713e-06, 6.62889192426519e-07, 1.596154106664471e-07]
+fan1.m_flow=[1.931788062847772e-14, 3.504560794681311e-03, 4.243341740220785e-03, 4.399063531309366e-03, 4.431887995451689e-03, 4.438805859535933e-03, 4.440265242010355e-03, 4.440573044121265e-03, 4.440638236701488e-03, 4.44065174087882e-03, 4.440654534846544e-03, 2.393142087385058e-03, 6.900938460603356e-04, 8.964021253632382e-05, 6.758473773515983e-06, 4.449394737093826e-07, 2.740601523498754e-08, 1.613383870946442e-09, 9.079181850779605e-11, 5.982547790495119e-12, 6.818989817247711e-13, 2.047131303697824e-03, 3.628941951319575e-03, 4.20480826869607e-03, 4.377293400466442e-03, 4.424422513693571e-03, 4.436626099050045e-03, 4.439677577465773e-03, 4.440422169864178e-03, 4.440600052475929e-03, 4.440642427653074e-03, 2.393139060586691e-03, 6.900930893607438e-04, 8.964011067291722e-05, 6.758466042810984e-06, 4.449394737093826e-07, 2.740336491058315e-08, 1.611396127643161e-09, 9.079181850779605e-11, 5.982547790495119e-12, 6.818989817247711e-13, 2.047131303697813e-03, 3.628941951319575e-03, 4.20480826869607e-03, 4.377293400466442e-03, 4.424422513693571e-03, 4.436626099050045e-03, 4.439677577465773e-03, 4.440422169864178e-03, 4.440600052475929e-03, 4.440642427653074e-03, 2.393139060586691e-03, 6.900930893607438e-04, 8.964011067291722e-05, 6.758466042811051e-06, 4.449381663107488e-07, 2.740402749168369e-08, 1.613383870946508e-09, 9.079181850779605e-11, 4.657385588302532e-12, 6.818989817247711e-13, 2.047131303697824e-03, 3.628941951319575e-03, 4.20480826869607e-03, 4.377293400466442e-03, 4.424422513693571e-03, 4.436626099050045e-03, 4.439677577465773e-03, 4.440422169864178e-03, 4.440600052475929e-03, 4.440642427653074e-03, 2.393139060586691e-03, 6.900930893607438e-04, 8.964011067291722e-05, 6.758465133316349e-06, 4.449374841897225e-07, 2.740336491058315e-08, 1.612058708744257e-09, 9.211698070998864e-11, 5.319966689398825e-12, 1.931788062847772e-14, 2.047131303697845e-03, 3.628941951319565e-03, 4.20480826869607e-03, 4.377293400466442e-03, 4.424422513693571e-03, 4.436626099050045e-03, 4.439677577465773e-03, 4.440422169864178e-03, 4.440600052475929e-03, 4.440642427653074e-03, 2.393139060586691e-03, 6.900930893607438e-04, 8.964011067291722e-05, 6.758466497558402e-06, 4.449381663107488e-07, 2.740402749168425e-08, 1.611396127643161e-09, 9.145439960889234e-11, 5.982547790495119e-12, 6.818989817247711e-13]
+fan3.m_flow=[0e+00, 1.455214689485729e-03, 3.085547592490911e-03, 3.914814908057451e-03, 4.258245695382357e-03, 4.382462240755558e-03, 4.423241596668959e-03, 4.435694310814142e-03, 4.439294803887606e-03, 4.44029038771987e-03, 4.440559074282646e-03, 4.148362204432487e-03, 3.029176499694586e-03, 1.886958139948547e-03, 8.56594240758566e-04, 2.587660274002701e-04, 6.976856820983812e-05, 1.789141424524127e-05, 4.442841600393876e-06, 1.078477453120286e-06, 2.57337887887843e-07, 3.264645347371697e-04, 2.091045491397381e-03, 3.281568875536323e-03, 3.948166966438293e-03, 4.253250546753407e-03, 4.375228192657232e-03, 4.419317469000816e-03, 4.434062168002129e-03, 4.438701551407576e-03, 4.4400948099792e-03, 4.148222040385008e-03, 3.029124578461051e-03, 1.886936603114009e-03, 8.565805619582494e-04, 2.587621565908194e-04, 6.976762961130589e-05, 1.789119232853409e-05, 4.442789759195875e-06, 1.078464720194461e-06, 2.573351594037376e-07, 3.264645347371653e-04, 2.091045491397381e-03, 3.281568875536323e-03, 3.948166966438293e-03, 4.253250546753407e-03, 4.375228192657232e-03, 4.419317469000816e-03, 4.434062168002129e-03, 4.438701551407576e-03, 4.4400948099792e-03, 4.148222040385008e-03, 3.029124578461051e-03, 1.886936603114009e-03, 8.565805619582534e-04, 2.587621565908194e-04, 6.976762961130511e-05, 1.789119232853436e-05, 4.442789759195875e-06, 1.078465174941812e-06, 2.573347046563867e-07, 3.264645347371697e-04, 2.091045491397381e-03, 3.281568875536323e-03, 3.948166966438293e-03, 4.253250546753407e-03, 4.375228192657232e-03, 4.419317469000816e-03, 4.434062168002129e-03, 4.438701551407576e-03, 4.4400948099792e-03, 4.148222040385008e-03, 3.029124578461051e-03, 1.886936603114009e-03, 8.565805619582534e-04, 2.587621565908194e-04, 6.976762961130589e-05, 1.789119232853409e-05, 4.442789759195875e-06, 1.078464720194461e-06, 2.573347046563867e-07, 3.264645347371841e-04, 2.091045491397367e-03, 3.281568875536323e-03, 3.948166966438293e-03, 4.253250546753407e-03, 4.375228192657232e-03, 4.419317469000816e-03, 4.434062168002129e-03, 4.438701551407576e-03, 4.4400948099792e-03, 4.148222040385008e-03, 3.029124578461051e-03, 1.886936603114009e-03, 8.565805619582534e-04, 2.587621565908194e-04, 6.976762961130589e-05, 1.789119232853409e-05, 4.442790213943226e-06, 1.07846426544711e-06, 2.573247002146672e-07]
+fan4.m_flow=[0e+00, 3.504560794681311e-03, 4.243341740220785e-03, 4.399063531309366e-03, 4.431887995451689e-03, 4.438805859535933e-03, 4.440265242010355e-03, 4.440573044121265e-03, 4.440638236701488e-03, 4.44065174087882e-03, 4.440654534846544e-03, 2.393142087385058e-03, 6.900938460603356e-04, 8.964021253632382e-05, 6.758473773515983e-06, 4.449393600225449e-07, 2.740534910117276e-08, 1.612079358892507e-09, 9.231371222995222e-11, 5.456968210637569e-12, 4.547473508864641e-13, 2.047131303697824e-03, 3.628941951319575e-03, 4.20480826869607e-03, 4.377293400466442e-03, 4.424422513693571e-03, 4.436626099050045e-03, 4.439677577465773e-03, 4.440422169864178e-03, 4.440600052475929e-03, 4.440642427653074e-03, 2.393139060586691e-03, 6.900930893607438e-04, 8.964011067291722e-05, 6.758465133316282e-06, 4.44938905275194e-07, 2.74039848591201e-08, 1.612534106243402e-09, 9.140421752817929e-11, 4.547473508864641e-12, 4.547473508864641e-13, 2.047131303697813e-03, 3.628941951319575e-03, 4.20480826869607e-03, 4.377293400466442e-03, 4.424422513693571e-03, 4.436626099050045e-03, 4.439677577465773e-03, 4.440422169864178e-03, 4.440600052475929e-03, 4.440642427653074e-03, 2.393139060586691e-03, 6.900930893607438e-04, 8.964011067291722e-05, 6.758466497558402e-06, 4.449379957804922e-07, 2.740262061706688e-08, 1.61253410624346e-09, 9.231371222995222e-11, 5.911715561524034e-12, 4.547473508864641e-13, 2.047131303697824e-03, 3.628941951319575e-03, 4.20480826869607e-03, 4.377293400466442e-03, 4.424422513693571e-03, 4.436626099050045e-03, 4.439677577465773e-03, 4.440422169864178e-03, 4.440600052475929e-03, 4.440642427653074e-03, 2.393139060586691e-03, 6.900930893607438e-04, 8.964011067291722e-05, 6.758466497558402e-06, 4.449379957804922e-07, 2.740353011176921e-08, 1.613443600945175e-09, 9.140421752817929e-11, 5.456968210637569e-12, 4.547473508864641e-13, 2.047131303697845e-03, 3.628941951319565e-03, 4.20480826869607e-03, 4.377293400466442e-03, 4.424422513693571e-03, 4.436626099050045e-03, 4.439677577465773e-03, 4.440422169864178e-03, 4.440600052475929e-03, 4.440642427653074e-03, 2.393139060586691e-03, 6.900930893607438e-04, 8.964011067291722e-05, 6.758466497558402e-06, 4.449375410331413e-07, 2.740489435382187e-08, 1.613898348296061e-09, 9.140421752817929e-11, 4.547473508864641e-12, 4.547473508864641e-13]
+time=[0e+00, 6e+02]
+fan2.dp=[0e+00, -1.245195678710938e+03, -9.872603515625e+03, -1.9522296875e+04, -2.4578626953125e+04, -2.6502759765625e+04, -2.7129015625e+04, -2.731593359375e+04, -2.736875390625e+04, -2.73830703125e+04, -2.73868828125e+04, -2.3535408203125e+04, -1.04932021484375e+04, -2.403994873046875e+03, -5.068251647949205e+02, -1.387017059326172e+02, -3.819892501831055e+01, -1.002017593383786e+01, -2.529377222061157e+00, -6.21390163898468e-01, -1.496282070875168e-01, -2.791298828125e+02, -3.81121875e+03, -1.28087763671875e+04, -2.0608859375e+04, -2.4763546875e+04, -2.6481796875e+04, -2.70978046875e+04, -2.7299982421875e+04, -2.7362421875e+04, -2.7380900390625e+04, -2.3533849609375e+04, -1.0492916015625e+04, -2.4039599609375e+03, -5.068216857910128e+02, -1.387010498046875e+02, -3.819877243041992e+01, -1.002013874053955e+01, -2.529368162155151e+00, -6.213880777359009e-01, -1.49627685546875e-01, -2.791298828124964e+02, -3.81121875e+03, -1.28087763671875e+04, -2.0608859375e+04, -2.4763546875e+04, -2.6481796875e+04, -2.70978046875e+04, -2.7299982421875e+04, -2.7362421875e+04, -2.7380900390625e+04, -2.3533849609375e+04, -1.0492916015625e+04, -2.4039599609375e+03, -5.068216857910156e+02, -1.387010498046875e+02, -3.81987724304195e+01, -1.00201387405397e+01, -2.529368162155151e+00, -6.213880181312561e-01, -1.496276706457138e-01, -2.791298828125e+02, -3.81121875e+03, -1.28087763671875e+04, -2.0608859375e+04, -2.4763546875e+04, -2.6481796875e+04, -2.70978046875e+04, -2.7299982421875e+04, -2.7362421875e+04, -2.7380900390625e+04, -2.3533849609375e+04, -1.0492916015625e+04, -2.4039599609375e+03, -5.068216857910156e+02, -1.387010498046875e+02, -3.819877243041992e+01, -1.002013874053955e+01, -2.529368162155151e+00, -6.213880181312561e-01, -1.496276408433914e-01, -2.791298828125119e+02, -3.811218749999939e+03, -1.28087763671875e+04, -2.0608859375e+04, -2.4763546875e+04, -2.6481796875e+04, -2.70978046875e+04, -2.7299982421875e+04, -2.7362421875e+04, -2.7380900390625e+04, -2.3533849609375e+04, -1.0492916015625e+04, -2.4039599609375e+03, -5.068216857910156e+02, -1.387010498046875e+02, -3.819877243041992e+01, -1.002013874053955e+01, -2.529368162155151e+00, -6.213880181312561e-01, -1.496220231056213e-01]
+fan1.dp=[0e+00, -1.7058375e+04, -2.50083984375e+04, -2.6877583984375e+04, -2.72801875e+04, -2.736541796875e+04, -2.73834140625e+04, -2.73872109375e+04, -2.738801171875e+04, -2.73881796875e+04, -2.7388216796875e+04, -7.95441845703125e+03, -1.266064086914062e+03, -1.594420013427734e+02, -1.201532840728754e+01, -7.910093069076538e-01, -4.872055351734161e-02, -2.865691203623995e-03, -1.628332829568535e-04, -9.014387615025043e-06, -4.885514499619603e-07, -5.8205498046875e+03, -1.8290701171875e+04, -2.4556263671875e+04, -2.6612220703125e+04, -2.718835546875e+04, -2.7338544921875e+04, -2.737616796875e+04, -2.7385349609375e+04, -2.738754296875e+04, -2.738806640625e+04, -7.95439990234375e+03, -1.266062622070312e+03, -1.594418182373047e+02, -1.201531600952137e+01, -7.910085916519165e-01, -4.872051253914833e-02, -2.865688875317574e-03, -1.628331519896165e-04, -9.014387615025043e-06, -4.885514499619603e-07, -5.820549804687444e+03, -1.8290701171875e+04, -2.4556263671875e+04, -2.6612220703125e+04, -2.718835546875e+04, -2.7338544921875e+04, -2.737616796875e+04, -2.7385349609375e+04, -2.738754296875e+04, -2.738806640625e+04, -7.95439990234375e+03, -1.266062622070312e+03, -1.594418182373047e+02, -1.201531600952148e+01, -7.910085916519165e-01, -4.872050881385704e-02, -2.865688642487034e-03, -1.628331519896165e-04, -9.014373063109815e-06, -4.885514499619603e-07, -5.8205498046875e+03, -1.8290701171875e+04, -2.4556263671875e+04, -2.6612220703125e+04, -2.718835546875e+04, -2.7338544921875e+04, -2.737616796875e+04, -2.7385349609375e+04, -2.738754296875e+04, -2.738806640625e+04, -7.95439990234375e+03, -1.266062622070312e+03, -1.594418182373047e+02, -1.201531600952148e+01, -7.910085320472717e-01, -4.872050881385803e-02, -2.86568864248693e-03, -1.628331374377012e-04, -9.014373063109815e-06, -4.885514499619603e-07, -5.820549804687627e+03, -1.82907011718749e+04, -2.4556263671875e+04, -2.6612220703125e+04, -2.718835546875e+04, -2.7338544921875e+04, -2.737616796875e+04, -2.7385349609375e+04, -2.738754296875e+04, -2.738806640625e+04, -7.95439990234375e+03, -1.266062622070312e+03, -1.594418182373047e+02, -1.201531600952148e+01, -7.910085320472717e-01, -4.872050881385803e-02, -2.86568864248693e-03, -1.628331374377012e-04, -9.014373063109815e-06, -4.885077942162752e-07]
+fan3.dp=[0e+00, -3.09716259765625e+03, -1.32242314453125e+04, -2.128653125e+04, -2.5184634765625e+04, -2.66751953125e+04, -2.7173873046875e+04, -2.732707421875e+04, -2.7371447265625e+04, -2.738372265625e+04, -2.73870390625e+04, -2.390043359375e+04, -1.2743310546875e+04, -4.944806640625e+03, -1.600877929687496e+03, -4.61916259765625e+02, -1.240554428100586e+02, -3.180354881286612e+01, -7.89736795425415e+00, -1.917039036750793e+00, -4.574286043643951e-01, -5.845455322265625e+02, -6.07435888671875e+03, -1.49575029296875e+04, -2.165067578125e+04, -2.5125564453125e+04, -2.6587205078125e+04, -2.712568359375e+04, -2.730696875e+04, -2.7364130859375e+04, -2.73813125e+04, -2.3898818359375e+04, -1.27428740234375e+04, -4.94469384765625e+03, -1.600849609374992e+03, -4.619093017578125e+02, -1.240537719726562e+02, -3.180315399169922e+01, -7.897275447845459e+00, -1.917017579078674e+00, -4.574236273765564e-01, -5.845455322265545e+02, -6.07435888671875e+03, -1.49575029296875e+04, -2.165067578125e+04, -2.5125564453125e+04, -2.6587205078125e+04, -2.712568359375e+04, -2.730696875e+04, -2.7364130859375e+04, -2.73813125e+04, -2.3898818359375e+04, -1.27428740234375e+04, -4.94469384765625e+03, -1.600849609375e+03, -4.619093017578125e+02, -1.240537719726549e+02, -3.180315399169969e+01, -7.897275447845459e+00, -1.917017579078674e+00, -4.574235379695892e-01, -5.845455322265625e+02, -6.07435888671875e+03, -1.49575029296875e+04, -2.165067578125e+04, -2.5125564453125e+04, -2.6587205078125e+04, -2.712568359375e+04, -2.730696875e+04, -2.7364130859375e+04, -2.73813125e+04, -2.3898818359375e+04, -1.27428740234375e+04, -4.94469384765625e+03, -1.600849609375e+03, -4.619093017578125e+02, -1.240537719726562e+02, -3.180315399169922e+01, -7.897275447845459e+00, -1.917017579078674e+00, -4.574234485626221e-01, -5.845455322265893e+02, -6.074358886718675e+03, -1.49575029296875e+04, -2.165067578125e+04, -2.5125564453125e+04, -2.6587205078125e+04, -2.712568359375e+04, -2.730696875e+04, -2.7364130859375e+04, -2.73813125e+04, -2.3898818359375e+04, -1.27428740234375e+04, -4.94469384765625e+03, -1.600849609375e+03, -4.619093017578125e+02, -1.240537719726562e+02, -3.180315399169922e+01, -7.897275447845459e+00, -1.917017459869385e+00, -4.574056267738342e-01]
+fan4.dp=[0e+00, -1.7058375e+04, -2.50083984375e+04, -2.6877583984375e+04, -2.72801875e+04, -2.736541796875e+04, -2.73834140625e+04, -2.73872109375e+04, -2.738801171875e+04, -2.73881796875e+04, -2.7388216796875e+04, -7.95441845703125e+03, -1.266064086914062e+03, -1.594420013427734e+02, -1.201532840728754e+01, -7.910093069076538e-01, -4.872055351734161e-02, -2.865691203623995e-03, -1.628332829568535e-04, -9.014387615025043e-06, -4.885514499619603e-07, -5.8205498046875e+03, -1.8290701171875e+04, -2.4556263671875e+04, -2.6612220703125e+04, -2.718835546875e+04, -2.7338544921875e+04, -2.737616796875e+04, -2.7385349609375e+04, -2.738754296875e+04, -2.738806640625e+04, -7.95439990234375e+03, -1.266062622070312e+03, -1.594418182373047e+02, -1.201531600952137e+01, -7.910085916519165e-01, -4.872051253914833e-02, -2.865688875317574e-03, -1.628331519896165e-04, -9.014387615025043e-06, -4.885514499619603e-07, -5.820549804687444e+03, -1.8290701171875e+04, -2.4556263671875e+04, -2.6612220703125e+04, -2.718835546875e+04, -2.7338544921875e+04, -2.737616796875e+04, -2.7385349609375e+04, -2.738754296875e+04, -2.738806640625e+04, -7.95439990234375e+03, -1.266062622070312e+03, -1.594418182373047e+02, -1.201531600952148e+01, -7.910085916519165e-01, -4.872050881385704e-02, -2.865688642487034e-03, -1.628331519896165e-04, -9.014373063109815e-06, -4.885514499619603e-07, -5.8205498046875e+03, -1.8290701171875e+04, -2.4556263671875e+04, -2.6612220703125e+04, -2.718835546875e+04, -2.7338544921875e+04, -2.737616796875e+04, -2.7385349609375e+04, -2.738754296875e+04, -2.738806640625e+04, -7.95439990234375e+03, -1.266062622070312e+03, -1.594418182373047e+02, -1.201531600952148e+01, -7.910085320472717e-01, -4.872050881385803e-02, -2.86568864248693e-03, -1.628331374377012e-04, -9.014373063109815e-06, -4.885514499619603e-07, -5.820549804687627e+03, -1.82907011718749e+04, -2.4556263671875e+04, -2.6612220703125e+04, -2.718835546875e+04, -2.7338544921875e+04, -2.737616796875e+04, -2.7385349609375e+04, -2.738754296875e+04, -2.738806640625e+04, -7.95439990234375e+03, -1.266062622070312e+03, -1.594418182373047e+02, -1.201531600952148e+01, -7.910085320472717e-01, -4.872050881385803e-02, -2.86568864248693e-03, -1.628331374377012e-04, -9.014373063109815e-06, -4.885077942162752e-07]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_FlowControlled_dp.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_FlowControlled_dp.txt
new file mode 100644
index 00000000..7547f110
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_FlowControlled_dp.txt
@@ -0,0 +1,21 @@
+last-generated=2017-05-01
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 0, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "0, 0, 0, 0",
+ "number of continuous time states": "3",
+ "linear": " "
+}
+gain.u=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.8e-01, 9.6e-01, 9.399999999999999e-01, 9.2e-01, 9e-01, 8.8e-01, 8.6e-01, 8.4e-01, 8.2e-01, 8e-01, 7.8e-01, 7.6e-01, 7.4e-01, 7.2e-01, 7e-01, 6.8e-01, 6.6e-01, 6.4e-01, 6.2e-01, 6e-01, 5.8e-01, 5.600000000000001e-01, 5.4e-01, 5.2e-01, 5e-01, 4.799999701981039e-01, 4.59999970198246e-01, 4.399999403962078e-01, 4.200000298016828e-01, 4.00000029801967e-01, 3.800000000000709e-01, 3.600000000002133e-01, 3.399999701981751e-01, 3.199999403965277e-01, 3.00000059603579e-01, 2.800000298018961e-01, 2.599999999998579e-01, 2.399999850990164e-01, 2.199999701982105e-01, 1.999999552972269e-01, 1.800000596036677e-01, 1.600000298018249e-01, 1.400000149008946e-01, 1.199999925493573e-01, 9.999997764865798e-02, 7.99999552972359e-02, 6.00000558784486e-02, 4.000003725226355e-02, 2.000001862613177e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+time=[0e+00, 1e+00]
+floMacDyn.dpMachine=[5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 4.899999904632762e+02, 4.800000107288143e+02, 4.700000011920905e+02, 4.599999916553667e+02, 4.500000119209048e+02, 4.40000002384181e+02, 4.299999928474571e+02, 4.200000131129952e+02, 4.100000035762714e+02, 3.999999940395476e+02, 3.900000143050858e+02, 3.800000047683619e+02, 3.699999952316381e+02, 3.599999856949142e+02, 3.500000059604524e+02, 3.399999964237286e+02, 3.299999868870048e+02, 3.200000071525429e+02, 3.09999997615819e+02, 2.999999880790952e+02, 2.900000083446333e+02, 2.799999988079095e+02, 2.699999892711857e+02, 2.600000095367238e+02, 2.5e+02, 2.399999904634183e+02, 2.299999809268365e+02, 2.199999713902548e+02, 2.100000214573089e+02, 2.000000119207271e+02, 1.900000023842164e+02, 1.799999928475638e+02, 1.69999983310982e+02, 1.599999737744003e+02, 1.500000238414544e+02, 1.400000143048726e+02, 1.300000047682909e+02, 1.199999952317091e+02, 1.099999856951274e+02, 9.999997615854565e+01, 9.000002622559973e+01, 8.0000016689018e+01, 7.000000715243625e+01, 5.999999761578356e+01, 4.999998807927288e+01, 3.999997854269114e+01, 3.000002860974522e+01, 2.000001907316348e+01, 1.000000953658174e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+floMacSta.dpMachine=[5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 4.899999904632762e+02, 4.800000107288143e+02, 4.700000011920905e+02, 4.599999916553667e+02, 4.500000119209048e+02, 4.40000002384181e+02, 4.299999928474571e+02, 4.200000131129952e+02, 4.100000035762714e+02, 3.999999940395476e+02, 3.900000143050858e+02, 3.800000047683619e+02, 3.699999952316381e+02, 3.599999856949142e+02, 3.500000059604524e+02, 3.399999964237286e+02, 3.299999868870048e+02, 3.200000071525429e+02, 3.09999997615819e+02, 2.999999880790952e+02, 2.900000083446333e+02, 2.799999988079095e+02, 2.699999892711857e+02, 2.600000095367238e+02, 2.5e+02, 2.399999904634183e+02, 2.299999809268365e+02, 2.199999713902548e+02, 2.100000214573089e+02, 2.000000119207271e+02, 1.900000023842164e+02, 1.799999928475638e+02, 1.69999983310982e+02, 1.599999737744003e+02, 1.500000238414544e+02, 1.400000143048726e+02, 1.300000047682909e+02, 1.199999952317091e+02, 1.099999856951274e+02, 9.999997615854565e+01, 9.000002622559973e+01, 8.0000016689018e+01, 7.000000715243625e+01, 5.999999761578356e+01, 4.999998807927288e+01, 3.999997854269114e+01, 3.000002860974522e+01, 2.000001907316348e+01, 1.000000953658174e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+floMacSta.VMachine_flow=[8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.269574561236532e-01, 8.18435141684307e-01, 8.098248253639021e-01, 8.011237309816372e-01, 7.923288450635582e-01, 7.834369561508751e-01, 7.744448120208307e-01, 7.653488636637858e-01, 7.561452421835572e-01, 7.468301001883517e-01, 7.37399234025447e-01, 7.278479979517463e-01, 7.181716514809674e-01, 7.08365128202104e-01, 6.984229743467359e-01, 6.883391701561766e-01, 6.781074269348072e-01, 6.677210405708527e-01, 6.571726177575721e-01, 6.464542021466689e-01, 6.355573030464142e-01, 6.24472378349057e-01, 6.131893870045353e-01, 6.016972175395726e-01, 5.899834632873535e-01, 5.780348066371309e-01, 5.658363464255568e-01, 5.533715125110781e-01, 5.406219639332634e-01, 5.275669851091361e-01, 5.141832860758756e-01, 5.004445214525206e-01, 4.863205908332456e-01, 4.717769532359281e-01, 4.5677361535486e-01, 4.412634299637007e-01, 4.251910525856137e-01, 4.084901728097878e-01, 3.910802347038705e-01, 3.728619366760776e-01, 3.537105238818496e-01, 3.334650147210963e-01, 3.119125524551994e-01, 2.887606264873492e-01, 2.635881285190654e-01, 2.354578876357342e-01, 1.978817781592568e-01, 1.445961095538764e-01, 7.660680489264066e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+floMacDyn.VMachine_flow=[1.178511261940002e+00, 8.419123287837006e-01, 8.355213999689077e-01, 8.353590369167394e-01, 8.353264331844805e-01, 8.353555798503711e-01, 8.353905677812596e-01, 8.353978395460171e-01, 8.353996872896587e-01, 8.353972434998624e-01, 8.353961110117716e-01, 8.353947401046398e-01, 8.353942632674372e-01, 8.353941440582275e-01, 8.353943824767711e-01, 8.353945016862738e-01, 8.353945016860962e-01, 8.353944420814514e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.248870887893696e-01, 8.163745495037018e-01, 8.0776584251471e-01, 7.990645097136884e-01, 7.902693853776341e-01, 7.813773176507325e-01, 7.723849351018248e-01, 7.632887483268048e-01, 7.54084948032251e-01, 7.447695676182888e-01, 7.35338463037409e-01, 7.257870481493476e-01, 7.161105228644923e-01, 7.063037611667655e-01, 6.963613092889552e-01, 6.862772666794615e-01, 6.76045344643767e-01, 6.656587198616242e-01, 6.551099990250486e-01, 6.443913449949269e-01, 6.334941478724075e-01, 6.224089251515778e-01, 6.111256357831927e-01, 5.996330490866403e-01, 5.879189372062683e-01, 5.759698037183191e-01, 5.637708070643735e-01, 5.513053771028787e-01, 5.385551132729504e-01, 5.254991807740094e-01, 5.121142896467875e-01, 4.983738858936406e-01, 4.842472134566915e-01, 4.696998505630715e-01, 4.546914761147438e-01, 4.39174644803063e-01, 4.230935651405152e-01, 4.063811816572344e-01, 3.889638525786334e-01, 3.707443028572081e-01, 3.515943205667099e-01, 3.31353341356295e-01, 3.098086873020611e-01, 2.866676093889746e-01, 2.615101616692747e-01, 2.333318040983775e-01, 1.953886359730736e-01, 1.421149613732217e-01, 7.455594305689447e-02, -2.038485370576382e-03, 1.810289620393743e-07, 5.61200353056379e-09, 1.304910515993604e-09, 8.894014918398909e-11, 5.448900870368339e-11, 2.003786864144587e-11, 1.054600851091436e-12, 7.031042414951116e-13, 7.031042414951116e-13, 3.514966095963246e-13, 3.514966095963246e-13, 8.380190371832265e-19, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+floMacDyn.P=[1.2025625e+03, 8.590941768244339e+02, 8.525728149353899e+02, 8.524071655215116e+02, 8.523739013699706e+02, 8.5240362548553e+02, 8.524393920915627e+02, 8.52446777343559e+02, 8.524486694330481e+02, 8.524461669922966e+02, 8.524450683596024e+02, 8.524436035155886e+02, 8.524431152342931e+02, 8.524429931640625e+02, 8.524432373046693e+02, 8.524434204101562e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.248870608470077e+02, 7.997138940871337e+02, 7.747958403602692e+02, 7.501421914757208e+02, 7.257576583338664e+02, 7.016449642188411e+02, 6.778071730102145e+02, 6.542475283053823e+02, 6.30969002425159e+02, 6.079751450888492e+02, 5.852694414944781e+02, 5.628552352412738e+02, 5.40736500768827e+02, 5.189170222690491e+02, 4.974009526931328e+02, 4.761924058120283e+02, 4.552958407663214e+02, 4.347159264936994e+02, 4.144573316422853e+02, 3.94525275547869e+02, 3.749250955895729e+02, 3.556622596910139e+02, 3.367426862242107e+02, 3.181726555143476e+02, 2.999586181640625e+02, 2.821076492026268e+02, 2.646271033198323e+02, 2.4752483881562e+02, 2.308093617025212e+02, 2.144894754398023e+02, 1.985749244094305e+02, 1.830761151949764e+02, 1.680041256733785e+02, 1.533713612566945e+02, 1.391912870298138e+02, 1.254784891917298e+02, 1.122493119388968e+02, 9.952192095882693e+01, 8.731840341771772e+01, 7.566208239302266e+01, 6.457857306474806e+01, 5.409851637157788e+01, 4.425838773780787e+01, 3.510215551301427e+01, 2.668470389841214e+01, 1.904748497069306e+01, 1.196258214227016e+01, 5.800616400509377e+00, 1.521551535777767e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+floMacSta.P=[8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.52443359375e+02, 8.269574343396723e+02, 8.017323877908819e+02, 7.767707549161436e+02, 7.520753579447388e+02, 7.276489547707891e+02, 7.034944515335694e+02, 6.796148512029665e+02, 6.560133364656753e+02, 6.326930014634395e+02, 6.096572129348409e+02, 5.869095782734729e+02, 5.644535628979286e+02, 5.422928972331205e+02, 5.204315485759918e+02, 4.988735479328966e+02, 4.776230698595216e+02, 4.566845736216534e+02, 4.360627282816343e+02, 4.15762263272906e+02, 3.957882759861282e+02, 3.761461649603986e+02, 3.568413673520455e+02, 3.378798626930264e+02, 3.192679009158389e+02, 3.010119934082031e+02, 2.83119093254552e+02, 2.655966161795423e+02, 2.484524815182709e+02, 2.316951650148885e+02, 2.153334696302668e+02, 1.993771857719014e+02, 1.838367505413767e+02, 1.687234554386063e+02, 1.540495990644878e+02, 1.398286772636649e+02, 1.260752757487052e+02, 1.128057923657834e+02, 1.00038408061419e+02, 8.779350864229981e+01, 7.609425697250489e+01, 6.496726031308603e+01, 5.444327733991651e+01, 4.455894013763546e+01, 3.535844212358048e+01, 2.689674378763565e+01, 1.922104221797258e+01, 1.211522352574861e+01, 5.90188815038526e+00, 1.56340607938879e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_FlowControlled_dpSystem.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_FlowControlled_dpSystem.txt
deleted file mode 100644
index ffc88be3..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_FlowControlled_dpSystem.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-last-generated=2017-05-11
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "2, 1, 1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "2, 1, 1",
- "number of continuous time states": "8",
- "linear": " "
-}
-floConDpSystem.dp_actual=[1.0000439453125e+02, 1.000199813850072e+02, 1.000769424487538e+02, 1.002575226056815e+02, 1.008448105916095e+02, 1.027112272281555e+02, 1.055003132208893e+02, 1.087498778305922e+02, 1.117683491255407e+02, 1.139896308505502e+02, 1.164220958707841e+02, 1.191831819393802e+02, 1.222847070028602e+02, 1.257280519697925e+02, 1.295014798700727e+02, 1.335781225033057e+02, 1.379151474722025e+02, 1.424542991035485e+02, 1.471243862841143e+02, 1.518453838144901e+02, 1.565336442424969e+02, 1.611078673122788e+02, 1.654945226008775e+02, 1.696322920214159e+02, 1.734748249564124e+02, 1.769918060302734e+02, 1.765649712524041e+02, 1.756829997918098e+02, 1.743756105266944e+02, 1.72679289175861e+02, 1.706341273484597e+02, 1.682783819378807e+02, 1.656366709750222e+02, 1.627527352181635e+02, 1.596684429009324e+02, 1.564192942771337e+02, 1.530349780542647e+02, 1.495400712651865e+02, 1.459548322525914e+02, 1.422958626313664e+02, 1.385767234208916e+02, 1.348084398054007e+02, 1.309999797199918e+02, 1.271586712739116e+02, 1.232904196066357e+02, 1.194000579097068e+02, 1.154915270095878e+02, 1.115680155835981e+02, 1.076321292542675e+02, 1.036860389230056e+02, 9.973145294189453e+01, 9.57421913250062e+01, 9.175292970811789e+01, 8.776366809122956e+01, 8.377443025176824e+01, 7.978516863487991e+01, 7.57958993886254e+01, 7.180663777170878e+01, 6.781737615482047e+01, 6.38281183526294e+01, 5.983888051316807e+01, 5.584961889627975e+01, 5.186035727939143e+01, 4.78710956625031e+01, 4.388183404561478e+01, 3.989257242868099e+01, 3.590333077456786e+01, 3.191407106501226e+01, 2.792480944813985e+01, 2.393554783122323e+01, 1.994628621435189e+01, 1.595702364380062e+01, 1.196778580433928e+01, 7.978469351691621e+00, 3.987435809487722e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-floConDp.dp_actual=[1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 1e+02, 9.799999809264796e+01, 9.600000214577105e+01, 9.400000023841901e+01, 9.199999833106696e+01, 9.000000238419005e+01, 8.800000047683801e+01, 8.599999856948597e+01, 8.400000262260906e+01, 8.200000071525702e+01, 7.999999880790497e+01, 7.800000286102807e+01, 7.600000095367602e+01, 7.399999904632398e+01, 7.199999713897193e+01, 7.000000119209503e+01, 6.799999928474298e+01, 6.599999737739094e+01, 6.400000143051403e+01, 6.199999952316199e+01, 5.999999761580995e+01, 5.800000166893303e+01, 5.5999999761581e+01, 5.399999785422896e+01, 5.200000190735204e+01, 5e+01, 4.799999809267638e+01, 4.599999618535275e+01, 4.399999427802913e+01, 4.200000429147814e+01, 4.000000238415452e+01, 3.800000047684511e+01, 3.599999856950729e+01, 3.399999666218367e+01, 3.199999475488505e+01, 3.000000476828632e+01, 2.800000286097179e+01, 2.600000095365726e+01, 2.399999904634274e+01, 2.199999713902821e+01, 1.999999523171368e+01, 1.800000524511495e+01, 1.600000333780041e+01, 1.400000143048589e+01, 1.199999952315717e+01, 9.99999761585685e+00, 7.999995708537205e+00, 6.000005721950409e+00, 4.000003814633605e+00, 2.000001907316803e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-time=[0e+00, 1e+00]
-floConDp.m_flow=[7.811802788637578e-05, 3.550992535028631e-04, 1.361265631368248e-03, 4.379620189648668e-03, 1.152900045798024e-02, 2.277743916168946e-02, 3.229102604420778e-02, 4.011452176629035e-02, 4.588950127165142e-02, 4.95433608506971e-02, 5.311431682142562e-02, 5.673718846658261e-02, 6.037156008482494e-02, 6.397383084931729e-02, 6.749933937286022e-02, 7.090478935982207e-02, 7.415071986969707e-02, 7.720369047480588e-02, 8.003786755188755e-02, 8.263599185989061e-02, 8.498937569415513e-02, 8.709740022381635e-02, 8.896633258226452e-02, 9.06079032493201e-02, 9.20377604243753e-02, 9.327401220798492e-02, 9.338781982692268e-02, 9.331867858546576e-02, 9.308896217213374e-02, 9.27192341544599e-02, 9.222798858376761e-02, 9.1630801710506e-02, 9.093739784130792e-02, 9.016195045177575e-02, 8.931711347222418e-02, 8.841304425247579e-02, 8.745785196878304e-02, 8.645796824285669e-02, 8.541843244480166e-02, 8.434318594417041e-02, 8.323524214054109e-02, 8.209686684994195e-02, 8.092970990862329e-02, 7.973490741657055e-02, 7.851316005284185e-02, 7.726481406182145e-02, 7.598989564170426e-02, 7.468812896989828e-02, 7.335900370925712e-02, 7.200176399345982e-02, 7.061541080474854e-02, 6.918869029815711e-02, 6.773192154047582e-02, 6.624312267129742e-02, 6.472009750261443e-02, 6.316034683592715e-02, 6.156108939428558e-02, 5.9919162390911e-02, 5.823095601226903e-02, 5.649232399943262e-02, 5.469846786189819e-02, 5.284373731215085e-02, 5.092149693418182e-02, 4.892378947877294e-02, 4.684096268814592e-02, 4.466110305356883e-02, 4.236925262204315e-02, 3.994611319737024e-02, 3.736616488110821e-02, 3.459434514467039e-02, 3.15801686761481e-02, 2.824458640909084e-02, 2.441430147160737e-02, 1.969235087231284e-02, 1.298988449323722e-02, -6.503704638640556e-14, 8.125178380511913e-15, 2.363344976174027e-15, -3.398488639923107e-15, -9.160287278156039e-15, -1.492212174128006e-14, -2.068395366327541e-14, -2.206089228278493e-14, -1.800433751553802e-14, -1.394778274829111e-14, -9.89125215956245e-15, -5.834696968799066e-15, -1.778142201552156e-15, 2.278411577832197e-15, 1.503484721105465e-15, 1.496478402275394e-16, -1.20418094482834e-15, -2.558017759532543e-15, -3.911854680113718e-15, -5.265691600706265e-15, -6.619528521279588e-15, -7.973365441857986e-15, -9.327194293084307e-15, -1.068103121366927e-14, -1.203486813425423e-14, -1.338870505483919e-14]
-floConDpSystem.m_flow=[7.812146213836968e-05, 3.551702086475437e-04, 1.362312205262601e-03, 4.390796062611617e-03, 1.161967869909651e-02, 2.320407055086763e-02, 3.31671957949928e-02, 4.183271130604653e-02, 4.851463525167409e-02, 5.289542894637965e-02, 5.730985410443881e-02, 6.194058088954022e-02, 6.676033271140035e-02, 7.173291089308843e-02, 7.681338458588956e-02, 8.194891801848492e-02, 8.708059225152529e-02, 9.214585929688696e-02, 9.708180675303696e-02, 1.018286581895782e-01, 1.063330979954693e-01, 1.10551225801728e-01, 1.144504477021533e-01, 1.180104151994062e-01, 1.212227956674464e-01, 1.240901350975037e-01, 1.253514746742448e-01, 1.262402377458879e-01, 1.267876922585015e-01, 1.270270050148951e-01, 1.269914360495644e-01, 1.267109961212183e-01, 1.262035365369459e-01, 1.255011717676734e-01, 1.246342215274823e-01, 1.236279078838786e-01, 1.225030364413088e-01, 1.212765953009326e-01, 1.199623563352339e-01, 1.18571383691411e-01, 1.171125331427021e-01, 1.155927697227661e-01, 1.140175291690564e-01, 1.123909887525366e-01, 1.107162307613753e-01, 1.089954653409968e-01, 1.07230150697284e-01, 1.054210735159891e-01, 1.035684625018899e-01, 1.016720551625133e-01, 9.973108768463135e-02, 9.771610601904708e-02, 9.565869321290754e-02, 9.355604783938194e-02, 9.140505362516223e-02, 8.92021980577495e-02, 8.694354499150048e-02, 8.462463150700662e-02, 8.224036139682338e-02, 7.978486358836091e-02, 7.725137338994816e-02, 7.463191829577162e-02, 7.191711050531331e-02, 6.909572195242066e-02, 6.615411803138325e-02, 6.307546783774322e-02, 5.98386612812296e-02, 5.641642797695792e-02, 5.277273326603278e-02, 4.885805300329945e-02, 4.460109233194522e-02, 3.989242423686484e-02, 3.45478778731546e-02, 2.820645469818346e-02, 1.965828652806928e-02, 7.418540709850079e-15, -1.058497540320187e-13, -3.893783127353081e-14, 2.797409148497328e-14, 3.83528323186407e-14, 2.711573185236756e-14, 1.587863138619243e-14, 4.641529649306043e-15, -6.5955712404702e-15, -1.783267170674032e-14, -2.906970688989845e-14, -4.030680566211984e-14, -5.154390782242456e-14, -6.278100520858854e-14, -5.479012173122592e-14, -4.449533784710894e-14, -3.420061532356819e-14, -2.390582974539946e-14, -1.361104501423842e-14, -3.316260706527763e-15, 6.978524024555455e-15, 1.727330917921428e-14, 2.756803170275503e-14, 3.786281728093791e-14, 4.815760116505489e-14, 5.845238843730366e-14]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_FlowControlled_m_flow.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_FlowControlled_m_flow.txt
new file mode 100644
index 00000000..924f9a79
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_FlowControlled_m_flow.txt
@@ -0,0 +1,19 @@
+last-generated=2017-05-01
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "0",
+ "number of continuous time states": "3",
+ "linear": " "
+}
+gain.u=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.8e-01, 9.6e-01, 9.399999999999999e-01, 9.2e-01, 9e-01, 8.8e-01, 8.6e-01, 8.4e-01, 8.2e-01, 8e-01, 7.8e-01, 7.6e-01, 7.4e-01, 7.2e-01, 7e-01, 6.8e-01, 6.6e-01, 6.4e-01, 6.2e-01, 6e-01, 5.8e-01, 5.600000000000001e-01, 5.4e-01, 5.2e-01, 5e-01, 4.799999701981039e-01, 4.59999970198246e-01, 4.399999403962078e-01, 4.200000298016828e-01, 4.00000029801967e-01, 3.800000000000709e-01, 3.600000000002133e-01, 3.399999701981751e-01, 3.199999403965277e-01, 3.00000059603579e-01, 2.800000298018961e-01, 2.599999999998579e-01, 2.399999850990164e-01, 2.199999701982105e-01, 1.999999552972269e-01, 1.800000596036677e-01, 1.600000298018249e-01, 1.400000149008946e-01, 1.199999925493573e-01, 9.999997764865798e-02, 7.99999552972359e-02, 6.00000558784486e-02, 4.000003725226355e-02, 2.000001862613177e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+time=[0e+00, 1e+00]
+floMacDyn.dpMachine=[2.5e+02, 4.752138986487071e+02, 4.968145449115859e+02, 4.995711365265358e+02, 4.999325866747649e+02, 4.999724121064191e+02, 4.999968261733893e+02, 5.000026550291286e+02, 5.000054321289062e+02, 5.000038146980296e+02, 5.00003143310706e+02, 5.000013427733556e+02, 5.000004882810863e+02, 5.000000305174326e+02, 4.999998779296875e+02, 5.000000305174872e+02, 5.000000915526798e+02, 5e+02, 4.999999389649529e+02, 4.999999389648801e+02, 4.999999694824219e+02, 4.999999694824219e+02, 4.999999694824219e+02, 4.999999694824219e+02, 5e+02, 5e+02, 4.844707767939033e+02, 4.653892418552113e+02, 4.462720054386654e+02, 4.274903104510217e+02, 4.091017673327075e+02, 3.911187786627766e+02, 3.73541979789839e+02, 3.563698648351549e+02, 3.39602056720111e+02, 3.232381800882007e+02, 3.072784039470986e+02, 2.917225720377461e+02, 2.765707631543481e+02, 2.618229772966862e+02, 2.474792565000654e+02, 2.335395458827579e+02, 2.200039193362744e+02, 2.06872415282632e+02, 1.941449250018728e+02, 1.818215035427893e+02, 1.699022009734455e+02, 1.583869157704367e+02, 1.472756841398095e+02, 1.365685220199171e+02, 1.262653656005859e+02, 1.16366247504698e+02, 1.068711600255851e+02, 9.778009553385269e+01, 8.909311216526429e+01, 8.081009116324982e+01, 7.293110077798337e+01, 6.545614106719798e+01, 5.838519673375698e+01, 5.171827920243014e+01, 4.545543217935963e+01, 3.973992183928475e+01, 3.451496363834432e+01, 2.979934291710567e+01, 2.560258691226172e+01, 2.193052636749217e+01, 1.878967099439893e+01, 1.611960479747923e+01, 1.354340064167538e+01, 1.113575691024078e+01, 8.96777574412711e+00, 6.958022254959202e+00, 5.094622532883343e+00, 3.35615124208493e+00, 1.69106068913007e+00, 5.663659796118736e-02, -8.370337396071311e-05, -5.013040291529013e-06, -1.24167503287809e-06, -1.553709269136981e-07, -9.57516733251122e-08, -3.613241971960276e-08, -2.895830818200066e-09, -2.430169114565739e-09, -1.964507220115061e-09, -1.484296741048709e-09, -1.018634794557207e-09, -5.384210716128671e-10, -7.275947206018747e-11, -2.91038304567337e-11, -2.91038304567337e-11, -2.91038304567337e-11, -2.91038304567337e-11, -2.91038304567337e-11, -2.91038304567337e-11, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+floMacSta.dpMachine=[5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 4.801999935531144e+02, 4.608000084353279e+02, 4.417999900388704e+02, 4.231999968862967e+02, 4.050000215053225e+02, 3.872000164127081e+02, 3.697999755192898e+02, 3.52800009875328e+02, 3.362000180864114e+02, 3.199999904871595e+02, 3.042000345801191e+02, 2.887999950599622e+02, 2.737999807548765e+02, 2.591999916648617e+02, 2.450000083684711e+02, 2.311999920988354e+02, 2.177999857950312e+02, 2.048000122355984e+02, 1.921999940013944e+02, 1.79999985742608e+02, 1.682000066614076e+02, 1.56800001721379e+02, 1.457999915075104e+02, 1.352000069045696e+02, 1.25e+02, 1.151999878312942e+02, 1.057999855807331e+02, 9.679997798952758e+01, 8.820001505824885e+01, 8.000000958427479e+01, 7.219999876978339e+01, 6.479999793060266e+01, 5.779998795530629e+01, 5.119998408346643e+01, 4.500001440024061e+01, 3.920612758433548e+01, 3.384468325731542e+01, 2.893679779505882e+01, 2.44920232299409e+01, 2.050925133349447e+01, 1.697760889728916e+01, 1.387727940966406e+01, 1.118050566425416e+01, 8.852399319524094e+00, 6.851849765777596e+00, 5.132411442959159e+00, 3.643203954550858e+00, 2.329765332518847e+00, 1.134993707013121e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+floMacSta.VMachine_flow=[8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.186064202449512e-01, 8.01823276404085e-01, 7.850448509188043e-01, 7.682710746054084e-01, 7.515019378272875e-01, 7.347371618183079e-01, 7.179768561664973e-01, 7.012207727789724e-01, 6.844688713849882e-01, 6.6772102311534e-01, 6.50977218259308e-01, 6.342371782009317e-01, 6.175009528474951e-01, 6.007683633850635e-01, 5.840394596620879e-01, 5.67313903549836e-01, 5.505917449089441e-01, 5.338728547460405e-01, 5.171571334090937e-01, 5.004445115198214e-01, 4.837348600577621e-01, 4.670280198210405e-01, 4.503239810083607e-01, 4.336226443770347e-01, 4.16923850774765e-01, 4.002275009684264e-01, 3.835335353521419e-01, 3.66841834716622e-01, 3.501524389253751e-01, 3.334650000170896e-01, 3.16779528065895e-01, 3.000959336646818e-01, 2.834141274064473e-01, 2.66734019883218e-01, 2.500555614893278e-01, 2.333785087006616e-01, 2.167028715251864e-01, 2.00028560555793e-01, 1.833554714840333e-01, 1.666835000012816e-01, 1.500126113589981e-01, 1.33342487618085e-01, 1.166731163874554e-01, 1.000043635562382e-01, 8.333613226691196e-02, 6.666831821067348e-02, 5.000094622485494e-02, 3.333374684084071e-02, 1.666677656265943e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+floMacDyn.VMachine_flow=[8.333333134651184e-01, 8.351897001344417e-01, 8.353681564350373e-01, 8.353909850124741e-01, 8.353939652443199e-01, 8.353942632674949e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.35394561290741e-01, 8.35394561290741e-01, 8.35394561290741e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.353945016860962e-01, 8.186409909446053e-01, 8.01859635238677e-01, 7.850795408223122e-01, 7.683036783441111e-01, 7.515323958032546e-01, 7.347656528389369e-01, 7.180033802321434e-01, 7.01245568313153e-01, 6.84491878778511e-01, 6.677424211817485e-01, 6.50997007003505e-01, 6.342555364322331e-01, 6.175178805659007e-01, 6.007839797994367e-01, 5.840537647775446e-01, 5.673270165712603e-01, 5.506037254413716e-01, 5.338838220013187e-01, 5.17167087384487e-01, 5.004535118201167e-01, 4.837429960923957e-01, 4.670353511922413e-01, 4.503305375184867e-01, 4.336285154351135e-01, 4.169290363788605e-01, 4.002321203276859e-01, 3.835375884671339e-01, 3.668454109936033e-01, 3.5015550856586e-01, 3.33467652424315e-01, 3.167818228447899e-01, 3.000979006176396e-01, 2.834157665336813e-01, 2.667353907892662e-01, 2.500566939779338e-01, 2.333797305956663e-01, 2.167043020365544e-01, 2.000302592883112e-01, 1.833574831412208e-01, 1.666858394842996e-01, 1.50015293567036e-01, 1.333454380481258e-01, 1.166758358496397e-01, 1.000066210820347e-01, 8.333786825156933e-02, 6.666951775303051e-02, 5.00016614818712e-02, 3.333408584286181e-02, 1.666686783244938e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_PowerExact.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_PowerExact.txt
new file mode 100644
index 00000000..ba77e309
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_PowerExact.txt
@@ -0,0 +1,20 @@
+last-generated=2016-03-07
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 1, 1",
+ "linear": "0, 0, 0"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 0, 1, 1",
+ "number of continuous time states": "3",
+ "linear": " "
+}
+pump_m_flow.P=[63.0987548828125, 63.0987548828125, 63.0987548828125, 63.0987548828125, 63.0987548828125, 63.0987548828125, 64.689422607421875, 66.30660247802734375, 67.9505157470703125, 69.62137603759765625, 71.31940460205078125, 73.04482269287109375, 74.79784393310546875, 76.57869720458984375, 78.3875885009765625, 80.2247467041015625, 82.09038543701171875, 83.9847259521484375, 85.907989501953125, 87.86038970947265625, 89.84215545654296875, 91.85349273681640625, 93.89463043212890625, 95.96578216552734375, 98.06717681884765625, 100.1990203857421875, 102.36153411865234375, 104.5549468994140625, 106.77947235107423296085, 109.03532409667967328915, 111.32273101806640625, 113.64190673828125, 115.99306488037109375, 118.376434326171875, 120.79222869873046875, 123.2406768798828125, 125.72197723388671875, 128.2363739013671875, 130.7840728759765625, 133.3652801513671875, 135.9802398681640625, 138.629150390625, 141.312255859375, 144.029754638671875, 146.7818603515625, 149.568817138671875, 152.3908233642578125, 155.2480926513671875, 158.140869140625, 161.069366455078125, 164.033782958984375, 167.0343475341796875, 170.0712890625, 173.1448211669921875, 176.2551727294921875, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125]
+pump_Nrpm.P=[63.0987548828125, 63.0987548828125, 63.0987548828125, 63.0987548828125, 63.0987548828125, 63.0987548828125, 64.689422607421875, 66.30660247802734375, 67.9505157470703125, 69.62137603759765625, 71.31940460205078125, 73.04482269287109375, 74.79784393310546875, 76.57869720458984375, 78.3875885009765625, 80.2247467041015625, 82.09038543701171875, 83.9847259521484375, 85.907989501953125, 87.86038970947265625, 89.84215545654296875, 91.85349273681640625, 93.89463043212890625, 95.96578216552734375, 98.06717681884765625, 100.1990203857421875, 102.36153411865234375, 104.5549468994140625, 106.77947235107423296085, 109.03532409667967328915, 111.32273101806640625, 113.64190673828125, 115.99306488037109375, 118.376434326171875, 120.79222869873046875, 123.2406768798828125, 125.72197723388671875, 128.2363739013671875, 130.7840728759765625, 133.3652801513671875, 135.9802398681640625, 138.629150390625, 141.312255859375, 144.029754638671875, 146.7818603515625, 149.568817138671875, 152.3908233642578125, 155.2480926513671875, 158.140869140625, 161.069366455078125, 164.033782958984375, 167.0343475341796875, 170.0712890625, 173.1448211669921875, 176.2551727294921875, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125]
+pump_dp.P=[63.0987548828125, 63.0987548828125, 63.0987548828125, 63.0987548828125, 63.0987548828125, 63.0987548828125, 64.689422607421875, 66.30660247802734375, 67.9505157470703125, 69.62137603759765625, 71.31940460205078125, 73.04482269287109375, 74.79784393310546875, 76.57869720458984375, 78.3875885009765625, 80.2247467041015625, 82.09038543701171875, 83.9847259521484375, 85.907989501953125, 87.86038970947265625, 89.84215545654296875, 91.85349273681640625, 93.89463043212890625, 95.96578216552734375, 98.06717681884765625, 100.1990203857421875, 102.36153411865234375, 104.5549468994140625, 106.77947235107423296085, 109.03532409667967328915, 111.32273101806640625, 113.64190673828125, 115.99306488037109375, 118.376434326171875, 120.79222869873046875, 123.2406768798828125, 125.72197723388671875, 128.2363739013671875, 130.7840728759765625, 133.3652801513671875, 135.9802398681640625, 138.629150390625, 141.312255859375, 144.029754638671875, 146.7818603515625, 149.568817138671875, 152.3908233642578125, 155.2480926513671875, 158.140869140625, 161.069366455078125, 164.033782958984375, 167.0343475341796875, 170.0712890625, 173.1448211669921875, 176.2551727294921875, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125]
+time=[0., 200.]
+pump_Nrpm.per.speed_rpm_nominal=[3040., 3040.]
+pump_Nrpm.Nrpm=[2400., 2400., 2400., 2400., 2400., 2400., 2420., 2440., 2460., 2480., 2500., 2520., 2540., 2560., 2580., 2600., 2620., 2640., 2660., 2680., 2700., 2720., 2740., 2760., 2780., 2800., 2820., 2840., 2860., 2880., 2900., 2920., 2940., 2960., 2980., 3000., 3020., 3040., 3060., 3080., 3100., 3120., 3140., 3160., 3180., 3200., 3220., 3240., 3260., 3280., 3300., 3320., 3340., 3360., 3380., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_PowerSimplified.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_PowerSimplified.txt
new file mode 100644
index 00000000..918db3fd
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_PowerSimplified.txt
@@ -0,0 +1,20 @@
+last-generated=2016-03-07
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1",
+ "linear": "0, 0, 0"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 0",
+ "number of continuous time states": "3",
+ "linear": " "
+}
+pump_m_flow.P=[90.13990020751953125, 90.13990020751953125, 90.13990020751953125, 90.13990020751953125, 90.13990020751953125, 90.13990020751953125, 92.41249847412109375, 94.7229766845703125, 97.07164764404296875, 99.45882415771484375, 101.88482666015625, 104.34995269775390625, 106.85453033447265625, 109.39886474609375, 111.98326873779296875, 114.608062744140625, 117.27355194091796875, 119.98004913330078125, 122.727874755859375, 125.517333984375, 128.3487396240234375, 131.2224273681640625, 134.138671875, 137.0978240966796875, 140.10015869140625, 143.146026611328125, 146.2357177734375, 149.3695526123046875, 152.5478363037109375, 155.7708892822265625, 159.039031982421875, 162.3525543212890625, 165.7117919921875, 169.1170501708984375, 172.5686492919921875, 176.06689453125, 179.612091064453125, 183.204559326171875, 186.8446197509765625, 190.5325775146484375, 194.2687530517578125, 198.0534515380859375, 201.886993408203125, 205.7696685791015625, 209.7018280029296875, 213.6837615966796875, 217.7157745361328125, 221.7982025146484375, 225.9313507080078125, 230.1155242919921875, 234.3510284423828125, 238.6381988525390625, 242.9773406982421875, 247.3687744140625, 251.8127899169921875, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625]
+pump_Nrpm.P=[63.0987548828125, 63.0987548828125, 63.0987548828125, 63.0987548828125, 63.0987548828125, 63.0987548828125, 64.689422607421875, 66.30660247802734375, 67.9505157470703125, 69.62137603759765625, 71.31940460205078125, 73.04482269287109375, 74.79784393310546875, 76.57869720458984375, 78.3875885009765625, 80.2247467041015625, 82.09038543701171875, 83.9847259521484375, 85.907989501953125, 87.86038970947265625, 89.84215545654296875, 91.85349273681640625, 93.89463043212890625, 95.96578216552734375, 98.06717681884765625, 100.1990203857421875, 102.36153411865234375, 104.5549468994140625, 106.77947235107423296085, 109.03532409667967328915, 111.32273101806640625, 113.64190673828125, 115.99306488037109375, 118.376434326171875, 120.79222869873046875, 123.2406768798828125, 125.72197723388671875, 128.2363739013671875, 130.7840728759765625, 133.3652801513671875, 135.9802398681640625, 138.629150390625, 141.312255859375, 144.029754638671875, 146.7818603515625, 149.568817138671875, 152.3908233642578125, 155.2480926513671875, 158.140869140625, 161.069366455078125, 164.033782958984375, 167.0343475341796875, 170.0712890625, 173.1448211669921875, 176.2551727294921875, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125, 179.4025421142578125]
+pump_dp.P=[90.13990020751953125, 90.13990020751953125, 90.13990020751953125, 90.13990020751953125, 90.13990020751953125, 90.13990020751953125, 92.41249847412109375, 94.7229766845703125, 97.07164764404296875, 99.45882415771484375, 101.88482666015625, 104.34995269775390625, 106.85453033447265625, 109.39886474609375, 111.98326873779296875, 114.608062744140625, 117.27355194091796875, 119.98004913330078125, 122.727874755859375, 125.517333984375, 128.3487396240234375, 131.2224273681640625, 134.138671875, 137.0978240966796875, 140.10015869140625, 143.146026611328125, 146.2357177734375, 149.3695526123046875, 152.5478363037109375, 155.7708892822265625, 159.039031982421875, 162.3525543212890625, 165.7117919921875, 169.1170501708984375, 172.5686492919921875, 176.06689453125, 179.612091064453125, 183.204559326171875, 186.8446197509765625, 190.5325775146484375, 194.2687530517578125, 198.0534515380859375, 201.886993408203125, 205.7696685791015625, 209.7018280029296875, 213.6837615966796875, 217.7157745361328125, 221.7982025146484375, 225.9313507080078125, 230.1155242919921875, 234.3510284423828125, 238.6381988525390625, 242.9773406982421875, 247.3687744140625, 251.8127899169921875, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625, 256.309722900390625]
+time=[0., 200.]
+pump_Nrpm.per.speed_rpm_nominal=[3040., 3040.]
+pump_Nrpm.Nrpm=[2400., 2400., 2400., 2400., 2400., 2400., 2420., 2440., 2460., 2480., 2500., 2520., 2540., 2560., 2580., 2600., 2620., 2640., 2660., 2680., 2700., 2720., 2740., 2760., 2780., 2800., 2820., 2840., 2860., 2880., 2900., 2920., 2940., 2960., 2980., 3000., 3020., 3040., 3060., 3080., 3100., 3120., 3140., 3160., 3180., 3200., 3220., 3240., 3260., 3280., 3300., 3320., 3340., 3360., 3380., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400., 3400.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_PumpCurveConstruction.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_PumpCurveConstruction.txt
new file mode 100644
index 00000000..040d34ee
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_PumpCurveConstruction.txt
@@ -0,0 +1,17 @@
+last-generated=2016-12-06
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 1, 1",
+ "linear": " "
+}
+pum_m_flow.dpMachine=[9.88738536834716796875, 10.08568191979532713276, 10.28999901747878986669, 10.50058366306244117538, 10.71769525597818173424, 10.94160555104217635858, 11.17260173139616519222, 11.41098498578627307154, 11.65707401946641574852, 11.91120329233543095881, 12.17372794956420456458, 12.44502069215340078756, 12.72547729537406269174, 13.01551260756349215342, 13.31556890582002417034, 13.62611275025907886516, 13.94763862908120088946, 14.28066819827041378232, 14.62575792070611768736, 14.98349770679356574021, 15.35450924143896145324, 15.73946024953163380644, 16.13905530079672701049, 16.55404454771714028993, 16.98523163625381826591, 17.4334659576416015625, 17.89965865839893410794, 18.38478035492806128559, 18.88987153609594926706, 19.41603896322794398088, 19.96446733757100489015, 20.53643594224405077853, 21.13330503399767934525, 21.75653755954577306397, 22.40771079203662452528, 23.08851474486329635738, 23.80077258306056364745, 24.546451206425267344, 25.32766761948382594483, 26.14671636984468605647, 27.00606866115291637698, 27.9084151730780902767, 28.85666593893406073335, 29.85397456807606531015, 30.90378787110414648964, 32.00984327979674048947, 33.1762189458733871561, 34.40737548734446704657, 35.70819236089735682071, 37.08400592119050287465, 38.540679931640625, 40.0846649164192143644, 41.72305621793540097997, 43.4636854334129125732, 45.31520436221018144352, 47.28722903412371181275, 49.3903994182580632355, 51.63656401939885398633, 54.03893697662193318365, 56.61229265046861058863, 59.37315835917799944355, 62.34017125953261029281, 65.53426204187890391495, 68.97908954939703107812, 72.70146737372135703481, 76.73188264380978296231, 81.10506779821719192114, 85.86082400455855179189, 91.04481885390440254469, 96.70968770492085297974, 102.91638202888350406283, 109.73572564080636482231, 117.25036674077283294082, 125.55741758364007409909, 134.77120055470234660788, 145.0272979736328125, 156.48730112476033582425, 169.34502753259431528932, 183.83437992488504164612, 200.23951071599455531214, 218.90859166310886507745, 240.27086864487137063406, 264.86055384146584401606, 293.34825760575705544397, 326.58417175265674359252, 365.6569439927362736853, 411.97743755576919966188, 467.39404507113869158275, 534.36105883436187014013, 616.18128478343635379133, 717.36386145305129957706, 844.15698429642145583784, 1005.35682023079311875335, 1213.52998626744556531776, 1486.8928993411257124535, 1852.16653579914077454305, 2348.83722299501050656545, 3035.22823598150216639624, 3996.42515347761400335003, 5352.79051390324548265198, 7265.74560546875]
+pum_dp.dpMachine=[9.89231395721435546875, 10.09070873711934268613, 10.29512787795689909842, 10.50581742771759330424, 10.72303678583417863024, 10.947057707100544377, 11.17816832839637619657, 11.41667079205699231181, 11.66288094240118233813, 11.91713705388606747704, 12.17979141084873084822, 12.4512195752179994912, 12.73181446124623050764, 13.0219937782882748678, 13.32219980333290187957, 13.63289718925220128654, 13.95458233183693508295, 14.28777688659506317492, 14.63303827031137060999, 14.99095448631788407567, 15.36215008000658599485, 15.74729182314614384097, 16.14708333121724592729, 16.56227857167745298739, 16.99367928346621070546, 17.442134857177734375, 17.90856025469564372088, 18.39392227665910439782, 18.89926141338458975838, 19.42568824019212669896, 19.97438936482920368576, 20.54664025736138555089, 21.14380308109095807367, 21.76734268915047820769, 22.41883826384108147067, 23.09997791035113579028, 23.81258669997379229244, 24.55863153461706005487, 25.34023513981187036848, 26.15968443379944119442, 27.01946015564810110732, 27.92225108022422119802, 28.87096723962066846525, 29.86876605636882331396, 30.91909434400979606039, 32.02569334759479602326, 33.19263740242715243767, 34.42440048131371099771, 35.72585440995342764836, 37.10233935559426043937, 38.559726715087890625, 40.10446319597358666442, 41.74365558473407844531, 43.48513166395041906753, 45.33755085682773966482, 47.3105368332343516613, 49.41472574247084281751, 51.66197753338733633655, 54.06551397450877516349, 56.64011324102826705484, 59.40231408710504723558, 62.3707575000802094678, 65.56638179210969497035, 69.01285725042906449289, 72.7370279842508011825, 76.76936586396206507743, 81.14462620335936549054, 85.90264834149537875874, 91.08909222856847520688, 96.75663899953011082289, 102.96624775522315076159, 109.78878808697427871266, 117.30693106135032621751, 125.61782712197164357804, 134.83586729852922303508, 145.0966644287109375, 156.56188609093644004133, 169.42541084516241767233, 183.92124823088090579404, 200.33364216935049739732, 219.01090183349580797767, 240.38241039058991077582, 264.98253260930766828096, 293.48213824238234792574, 326.73163272857311767439, 365.81996885579053468973, 412.1583152144682458129, 467.59549159401018414428, 534.58621753813702071056, 616.43372623203174498485, 717.64749190417921909102, 844.47577082147415694635, 1005.71424203958304133266, 1213.92756924688251274347, 1487.32746966090167006769, 1852.62454362109929206781, 2349.28570923146025961614, 3035.60128317431053801556, 3996.62022226073349884246, 5352.74510392859974672319, 7265.74169921875]
+pum_no.dpMachine=[9.88739776611328125, 10.08569431756144041401, 10.29001236891921955419, 10.5005979681768675249, 10.71770956109292782799, 10.94162080983088358721, 11.17261699018522769222, 11.41100119824965197779, 11.65709023192979465477, 11.91122045847312627131, 12.17374606937621628333, 12.44503976563972891256, 12.72549636886166979366, 13.01553263472413668467, 13.31558988665498510784, 13.62613468476835620891, 13.94766151726479463946, 14.28069204012832393857, 14.62578366990925005098, 14.98352345600124557734, 15.35453689799413723449, 15.73948885976425238198, 16.13908391102735606637, 16.55407697263991906311, 16.98526406118057607841, 17.4335002899169921875, 17.89969680537159035794, 18.3848204092391185327, 18.88991159041723832956, 19.41608092490582393452, 19.96451311393819239015, 20.53648362595987109103, 21.13335462506895368051, 21.75659096530749181397, 22.40776610514697608778, 23.08857387267091354488, 23.80083552555180403942, 24.5465179636274157815, 25.32774009872732534632, 26.14679075644136574397, 27.00614876978981016009, 27.9085010037665668392, 28.85675558433230847299, 29.85407184285633874765, 30.9038908679325921014, 32.00995390601744361447, 33.1763372014886215311, 34.40750518705149829657, 35.7083296900193829515, 37.08415087968659662465, 38.54084014892578125, 40.08483657781435738343, 41.72324313810141660497, 43.46388761242256038031, 45.31542561461066043194, 47.28746554533144319521, 49.39065881766303078848, 51.63684630701015265686, 54.03924596716411343778, 56.61262834392803000583, 59.37353219941908122337, 62.3405794320854624857, 65.53471217613805777091, 68.97958546007792790533, 72.70202431957669375606, 76.73250062494871315266, 81.10575444362496000394, 85.86159457327887878364, 91.04568097540457927153, 96.71066426744813782079, 102.91748829127243425319, 109.73698449123142495409, 117.25180106639902533061, 125.55905790302773539224, 134.77309264432781787946, 145.0294952392578125, 156.48986460168663370496, 169.34803351491271428131, 183.8379199654754927451, 200.24370688134968077065, 218.91361180361906235703, 240.27692638385633472353, 264.86790857888536265818, 293.35732132977068431501, 326.59543274578777527495, 365.67110414134668872066, 411.99544292075125895281, 467.41729946283237495663, 534.39151538155056186952, 616.22187318024111846171, 717.41885417176001737971, 844.23291196676905201457, 1005.46350962432904907473, 1213.68220790915324869275, 1487.11177143093800623319, 1852.47781522261539066676, 2349.25372708461190995877, 3035.6781872441797531792, 3996.68907005900791773456, 5352.74510392859974672319, 7265.74169921875]
+pum.dpMachine=[9.89231395721435546875, 10.09070873711934268613, 10.29512787795689909842, 10.50581742771759330424, 10.72303678583417863024, 10.947057707100544377, 11.17816832839637619657, 11.41667079205699231181, 11.66288094240118233813, 11.91713705388606747704, 12.17979141084873084822, 12.4512195752179994912, 12.73181446124623050764, 13.0219937782882748678, 13.32219980333290187957, 13.63289718925220128654, 13.95458233183693508295, 14.28777688659506317492, 14.63303827031137060999, 14.99095448631788407567, 15.36215008000658599485, 15.74729182314614384097, 16.14708333121724592729, 16.56227857167745298739, 16.99367928346621070546, 17.442134857177734375, 17.90856025469564372088, 18.39392227665910439782, 18.89926141338458975838, 19.42568824019212669896, 19.97438936482920368576, 20.54664025736138555089, 21.14380308109095807367, 21.76734268915047820769, 22.41883826384108147067, 23.09997791035113579028, 23.81258669997379229244, 24.55863153461706005487, 25.34023513981187036848, 26.15968443379944119442, 27.01946015564810110732, 27.92225108022422119802, 28.87096723962066846525, 29.86876605636882331396, 30.91909434400979606039, 32.02569334759479602326, 33.19263740242715243767, 34.42440048131371099771, 35.72585440995342764836, 37.10233935559426043937, 38.559726715087890625, 40.10446319597358666442, 41.74365558473407844531, 43.48513166395041906753, 45.33755085682773966482, 47.3105368332343516613, 49.41472574247084281751, 51.66197753338733633655, 54.06551397450877516349, 56.64011324102826705484, 59.40231408710504723558, 62.3707575000802094678, 65.56638179210969497035, 69.01285725042906449289, 72.7370279842508011825, 76.76936586396206507743, 81.14462620335936549054, 85.90264834149537875874, 91.08909222856847520688, 96.75663899953011082289, 102.96624775522315076159, 109.78878808697427871266, 117.30693106135032621751, 125.61782712197164357804, 134.83586729852922303508, 145.0966644287109375, 156.56188609093644004133, 169.42541084516241767233, 183.92124823088090579404, 200.33364216935049739732, 219.01090183349580797767, 240.38241039058991077582, 264.98253260930766828096, 293.48213824238234792574, 326.73163272857311767439, 365.81996885579053468973, 412.1583152144682458129, 467.59549159401018414428, 534.58621753813702071056, 616.43372623203174498485, 717.64749190417921909102, 844.47577082147415694635, 1005.71424203958304133266, 1213.92756924688251274347, 1487.32746966090167006769, 1852.62454362109929206781, 2349.28570923146025961614, 3035.60128317431053801556, 3996.62022226073349884246, 5352.74510392859974672319, 7265.74169921875]
+time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_PumpCurveDerivatives.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_PumpCurveDerivatives.txt
deleted file mode 100644
index 2e84d4ce..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_PumpCurveDerivatives.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-last-generated=2017-08-02
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1",
- "number of continuous time states": "3",
- "linear": " "
-}
-ddp_dNrpm.y=[0e+00, 8.449301465838277e-01, 2.607807964771964e+00, 4.70843186782542e+00, 6.933229171532072e+00, 9.203629323852127e+00, 1.14908049795985e+01, 1.378419010953118e+01, 1.607970278788203e+01, 1.837594903835391e+01, 2.067248882404319e+01, 2.296906484940934e+01, 2.52655817469406e+01, 2.75620147210962e+01, 2.985835252426324e+01, 3.215456253519805e+01, 3.445064626788569e+01, 3.674658162071629e+01, 3.904236438580634e+01, 4.133798653972806e+01, 4.363343742627651e+01, 4.592870862761779e+01, 4.822378567397062e+01, 5.051866054156506e+01, 5.28133328348888e+01, 5.510778427124023e+01, 5.740201405914115e+01, 5.969600431382832e+01, 6.198976107911368e+01, 6.428327370327382e+01, 6.657652772288029e+01, 6.886953680684675e+01, 7.116228649083527e+01, 7.345476231384573e+01, 7.57469855694297e+01, 7.80389417957003e+01, 8.03306317926429e+01, 8.26220615905317e+01, 8.491323961783706e+01, 8.720415824521906e+01, 8.949482590522261e+01, 9.178525625120453e+01, 9.407545771489123e+01, 9.636543110140668e+01, 9.865519768944139e+01, 1.009447659128454e+02, 1.032341442078152e+02, 1.055233614789389e+02, 1.0781242616189e+02, 1.101013543235284e+02, 1.123901824951172e+02, 1.146788962256099e+02, 1.1696756417959e+02, 1.192561710983774e+02, 1.215447720056431e+02, 1.238334170715942e+02, 1.26122077396218e+02, 1.284108597913596e+02, 1.306996955924014e+02, 1.329886992406684e+02, 1.352778265736466e+02, 1.375671811731345e+02, 1.398567951728731e+02, 1.421466227960588e+02, 1.444368318895895e+02, 1.467273766774254e+02, 1.490182892797201e+02, 1.513095970059359e+02, 1.536013472377076e+02, 1.558935857516551e+02, 1.581863278067732e+02, 1.60479634438267e+02, 1.627735224892041e+02, 1.650680650810113e+02, 1.673632638020579e+02, 1.696591491699219e+02, 1.719556754076541e+02, 1.742516981038921e+02, 1.765471104482038e+02, 1.78842020833206e+02, 1.811362887693748e+02, 1.834297479884338e+02, 1.85722367972417e+02, 1.880141029447266e+02, 1.903048308350664e+02, 1.925944464466934e+02, 1.948829312973875e+02, 1.971701038901486e+02, 1.994561168123216e+02, 2.017407716995396e+02, 2.040238701869628e+02, 2.063053986807311e+02, 2.085855064498817e+02, 2.108637221260054e+02, 2.131396947562786e+02, 2.154143551272405e+02, 2.176871081455113e+02, 2.19957619849746e+02, 2.222259020465867e+02, 2.244923989624151e+02, 2.267565002441406e+02]
-time=[0e+00, 1e+00]
-ddp_dm_flow.y=[-1.083289861679077e+00, 1.838866144173875e+02, 2.656847555053542e+02, 2.964311224943598e+02, 2.953054184361474e+02, 2.693631007581002e+02, 2.21192435655217e+02, 1.580591295585634e+02, 1.270259482834521e+02, 1.576806432759952e+02, 2.603230697999272e+02, 4.397227307784742e+02, 6.973673910720411e+02, 1.104112337012186e+03, 2.673752325984769e+03, 4.801181317362133e+03, 6.928470937614669e+03, 8.849201824026202e+03, 1.048915515393218e+04, 1.203250820258949e+04, 1.377510296190683e+04, 1.583592336627987e+04, 1.825900226886367e+04, 2.111244598046183e+04, 2.432340602704299e+04, 2.75000390625e+04, 3.048416094920787e+04, 3.343351627652169e+04, 3.663896444681881e+04, 4.017258515347931e+04, 4.38781205694048e+04, 4.783937009949997e+04, 5.240686700793439e+04, 5.812228138668529e+04, 6.297791655932188e+04, 6.510909774174524e+04, 6.476290677417522e+04, 6.455689068670931e+04, 6.448551170187447e+04, 6.446198045324351e+04, 6.445489453374128e+04, 6.445224218672467e+04, 6.444973046442169e+04, 6.44464960955102e+04, 6.444515234359168e+04, 6.444468359344732e+04, 6.444452343758149e+04, 6.444445312499767e+04, 6.44444453125e+04, 6.444444140626863e+04, 6.44444140625e+04, 6.444441015625e+04, 6.444441406253725e+04, 6.44444140625e+04, 6.444440234379191e+04, 6.444438671877328e+04, 6.444437890625e+04, 6.444437109375e+04, 6.44443671875e+04, 6.44443671875e+04, 6.44443671875e+04, 6.44443671875e+04, 6.44443671875e+04, 6.444437109375e+04, 6.444437109375e+04, 6.444437109375e+04, 6.444437109375e+04, 4.617686657583145e+04, 1.698706227885412e+04, 6.249832633865404e+03, 2.299323687589357e+03, 8.458930694066613e+02, 3.112446368977364e+02, 1.154482462838223e+02, 4.269236289890949e+01, 1.587043571472168e+01, 5.863545105376088e+00, 2.289233800031727e+00, 1.265993170349842e+00, 6.705704853156318e-01, 1.70921814375511e-01, -4.107374813049783e-02, -4.178293743950767e-02, -3.12139580543066e-03, 1.031800240216506e-02, 3.310140044425215e-02, 3.985446982819105e-02, 2.735297179110421e-02, 1.656482069010467e-02, 8.561907162227874e-03, 1.006005517488941e-02, 1.55256224996712e-02, 1.156924712446766e-02, 6.976705738857438e-03, 1.622570960706664e-03, -1.760039918825204e-03, -3.571413813342883e-03, -3.61705369226698e-03, -2.351452973562597e-03, -1.593348083009847e-03, -3.901317541021854e-04]
-dm_flow_dNrpm.y=[0e+00, 1.192141256151268e-03, 3.679447003163486e-03, 6.643289907687531e-03, 9.782334143260693e-03, 1.298572005952121e-02, 1.621277487430671e-02, 1.944858943707889e-02, 2.268740220180925e-02, 2.59272481834524e-02, 2.916750263567168e-02, 3.240780179144448e-02, 3.564800781491652e-02, 3.888808345317372e-02, 4.212800766588205e-02, 4.536773443839773e-02, 4.860724997140485e-02, 5.184652970924904e-02, 5.508555612759938e-02, 5.832431170071949e-02, 6.15627681498729e-02, 6.480090532406294e-02, 6.803870239705667e-02, 7.127612694138914e-02, 7.451316142863498e-02, 7.774977385997772e-02, 8.098594407881962e-02, 8.422163526781283e-02, 8.745683691084406e-02, 9.069150956157375e-02, 9.392562123074448e-02, 9.715915394227871e-02, 1.003920682543799e-01, 1.03624339633918e-01, 1.068559426434123e-01, 1.100868452968916e-01, 1.133170007159366e-01, 1.165464058022141e-01, 1.197750211253674e-01, 1.230028168829675e-01, 1.262297462066314e-01, 1.294558059783573e-01, 1.326809418762508e-01, 1.359051293918239e-01, 1.391283579403384e-01, 1.423505732078845e-01, 1.455717506950337e-01, 1.487918648981409e-01, 1.520108913141628e-01, 1.552287756515716e-01, 1.584455072879791e-01, 1.616610915324422e-01, 1.648754091759301e-01, 1.680885049215e-01, 1.713002404212206e-01, 1.745106241586151e-01, 1.777196965912439e-01, 1.809272789049745e-01, 1.841335052101183e-01, 1.87338181791265e-01, 1.905413342652849e-01, 1.937429263102566e-01, 1.969428643229963e-01, 2.001412079082553e-01, 2.033377037460803e-01, 2.065324412429054e-01, 2.097252970664978e-01, 2.129163390799831e-01, 2.161054439390137e-01, 2.192925222363256e-01, 2.224775143666907e-01, 2.256603458244245e-01, 2.288409231530272e-01, 2.320191948609422e-01, 2.351950674774287e-01, 2.383684515953064e-01, 2.415390938931296e-01, 2.447052807343768e-01, 2.47866699195942e-01, 2.510233751796003e-01, 2.541749439843808e-01, 2.573209993496209e-01, 2.60461392262177e-01, 2.635959141051213e-01, 2.667241774484273e-01, 2.698458358794206e-01, 2.729607179946115e-01, 2.760683283307765e-01, 2.791691437227292e-01, 2.822624787166282e-01, 2.85347558450031e-01, 2.884243944129296e-01, 2.914935001235235e-01, 2.945529796681769e-01, 2.976015515431407e-01, 3.006428218314197e-01, 3.03674376541448e-01, 3.066946777858316e-01, 3.097036721584179e-01, 3.127033085871375e-01, 3.156906366348267e-01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_Pump_Nrpm_stratos.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_Pump_Nrpm_stratos.txt
new file mode 100644
index 00000000..ce75c9e1
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_Pump_Nrpm_stratos.txt
@@ -0,0 +1,24 @@
+last-generated=2017-05-02
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "20",
+ "linear": " "
+}
+pump2.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.530241459608078e-02, 2.59313553571701e-01, 4.647542536258698e-01, 6.727919578552246e-01, 8.810957074165344e-01, 1.089427828788757e+00, 1.297760605812073e+00, 1.506093859672546e+00, 1.714427351951599e+00, 1.922760605812073e+00, 2.131093978881836e+00, 2.33942723274231e+00, 2.547760725021362e+00, 2.756093978881836e+00, 2.96442723274231e+00, 3.172760725021362e+00, 3.381093978881836e+00, 3.58942723274231e+00, 3.797760725021362e+00, 4.006093978881836e+00, 4.214427471160889e+00, 4.422760486602783e+00, 4.631093978881836e+00, 4.839427471160889e+00, 5.047760486602783e+00, 5.256093978881836e+00, 5.464427471160889e+00, 5.672760486602783e+00, 5.881093978881836e+00, 6.089427471160889e+00, 6.297760486602783e+00, 6.506093978881836e+00, 6.714427471160889e+00, 6.922760486602783e+00, 7.131093978881836e+00, 7.339427471160889e+00, 7.547760486602783e+00, 7.756093978881836e+00, 7.964427471160889e+00, 8.172760963439941e+00, 8.381093978881836e+00, 8.58942699432373e+00, 8.797760963439941e+00, 9.006093978881836e+00, 9.21442699432373e+00, 9.422760963439941e+00, 9.631093978881836e+00, 9.83942699432373e+00, 1.004776096343994e+01, 1.025609397888184e+01, 1.046442699432373e+01, 1.067276096343994e+01, 1.088109397888184e+01, 1.108942699432373e+01, 1.129776096343994e+01, 1.150609397888184e+01, 1.171442699432373e+01, 1.192276096343994e+01, 1.213109397888184e+01, 1.233942699432373e+01, 1.254776096343994e+01, 1.275609397888184e+01, 1.296442699432373e+01, 1.317276096343994e+01, 1.338109397888184e+01, 1.358942699432373e+01, 1.379776096343994e+01, 1.400609397888184e+01, 1.421442699432373e+01, 1.442276096343994e+01, 1.463109397888184e+01, 1.483942699432373e+01, 1.504776096343994e+01, 1.52246561050415e+01, 1.527103614807129e+01, 1.527706527709961e+01, 1.527769947052002e+01, 1.527777767181396e+01, 1.527777481079102e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01]
+pump5.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.530241459608078e-02, 2.59313553571701e-01, 4.647542536258698e-01, 6.727919578552246e-01, 8.810957074165344e-01, 1.089427828788757e+00, 1.297760605812073e+00, 1.506093859672546e+00, 1.714427351951599e+00, 1.922760605812073e+00, 2.131093978881836e+00, 2.33942723274231e+00, 2.547760725021362e+00, 2.756093978881836e+00, 2.96442723274231e+00, 3.172760725021362e+00, 3.381093978881836e+00, 3.58942723274231e+00, 3.797760725021362e+00, 4.006093978881836e+00, 4.214427471160889e+00, 4.391339302062988e+00, 4.437720775604248e+00, 4.443741798400879e+00, 4.444375514984131e+00, 4.444436073303223e+00, 4.444443702697754e+00, 4.44444465637207e+00, 4.444444179534912e+00, 4.444444179534912e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00]
+pump1.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.530241459608078e-02, 2.59313553571701e-01, 4.647542536258698e-01, 6.727919578552246e-01, 8.810957074165344e-01, 1.089427828788757e+00, 1.297760605812073e+00, 1.506093859672546e+00, 1.714427351951599e+00, 1.922760605812073e+00, 2.131093978881836e+00, 2.33942723274231e+00, 2.547760725021362e+00, 2.756093978881836e+00, 2.96442723274231e+00, 3.172760725021362e+00, 3.381093978881836e+00, 3.58942723274231e+00, 3.797760725021362e+00, 4.006093978881836e+00, 4.214427471160889e+00, 4.422760486602783e+00, 4.631093978881836e+00, 4.839427471160889e+00, 5.047760486602783e+00, 5.256093978881836e+00, 5.464427471160889e+00, 5.672760486602783e+00, 5.881093978881836e+00, 6.089427471160889e+00, 6.297760486602783e+00, 6.506093978881836e+00, 6.714427471160889e+00, 6.922760486602783e+00, 7.131093978881836e+00, 7.339427471160889e+00, 7.547760486602783e+00, 7.756093978881836e+00, 7.964427471160889e+00, 8.172760963439941e+00, 8.381093978881836e+00, 8.58942699432373e+00, 8.797760963439941e+00, 9.006093978881836e+00, 9.21442699432373e+00, 9.422760963439941e+00, 9.631093978881836e+00, 9.83942699432373e+00, 1.004776096343994e+01, 1.025609397888184e+01, 1.046442699432373e+01, 1.067276096343994e+01, 1.088109397888184e+01, 1.105802631378174e+01, 1.110441112518311e+01, 1.111040210723877e+01, 1.111104869842529e+01, 1.111110305786133e+01, 1.111111259460449e+01, 1.111110973358154e+01, 1.111111068725586e+01, 1.111111164093018e+01, 1.111111164093018e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01]
+pump4.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.530241459608078e-02, 2.59313553571701e-01, 4.647542536258698e-01, 6.727919578552246e-01, 8.810957074165344e-01, 1.089427828788757e+00, 1.297760605812073e+00, 1.506093859672546e+00, 1.714427351951599e+00, 1.922760605812073e+00, 2.131093978881836e+00, 2.33942723274231e+00, 2.547760725021362e+00, 2.756093978881836e+00, 2.96442723274231e+00, 3.172760725021362e+00, 3.381093978881836e+00, 3.58942723274231e+00, 3.797760725021362e+00, 4.006093978881836e+00, 4.214427471160889e+00, 4.422760486602783e+00, 4.631093978881836e+00, 4.839427471160889e+00, 5.047760486602783e+00, 5.256093978881836e+00, 5.464427471160889e+00, 5.672760486602783e+00, 5.881093978881836e+00, 6.058006763458252e+00, 6.104397296905518e+00, 6.110400676727295e+00, 6.111044406890869e+00, 6.111104965209961e+00, 6.111111640930176e+00, 6.111110210418701e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00]
+time=[0e+00, 1e+03]
+pump3.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.530241459608078e-02, 2.59313553571701e-01, 4.647542536258698e-01, 6.727919578552246e-01, 8.810957074165344e-01, 1.089427828788757e+00, 1.297760605812073e+00, 1.506093859672546e+00, 1.714427351951599e+00, 1.922760605812073e+00, 2.131093978881836e+00, 2.33942723274231e+00, 2.547760725021362e+00, 2.756093978881836e+00, 2.96442723274231e+00, 3.172760725021362e+00, 3.381093978881836e+00, 3.58942723274231e+00, 3.797760725021362e+00, 4.006093978881836e+00, 4.214427471160889e+00, 4.422760486602783e+00, 4.631093978881836e+00, 4.839427471160889e+00, 5.047760486602783e+00, 5.256093978881836e+00, 5.464427471160889e+00, 5.672760486602783e+00, 5.881093978881836e+00, 6.089427471160889e+00, 6.297760486602783e+00, 6.506093978881836e+00, 6.714427471160889e+00, 6.922760486602783e+00, 7.131093978881836e+00, 7.339427471160889e+00, 7.547760486602783e+00, 7.756093978881836e+00, 7.964427471160889e+00, 8.172760963439941e+00, 8.381093978881836e+00, 8.58942699432373e+00, 8.797760963439941e+00, 9.006093978881836e+00, 9.21442699432373e+00, 9.422760963439941e+00, 9.631093978881836e+00, 9.83942699432373e+00, 1.004776096343994e+01, 1.025609397888184e+01, 1.046442699432373e+01, 1.067276096343994e+01, 1.088109397888184e+01, 1.105802631378174e+01, 1.110441112518311e+01, 1.111040210723877e+01, 1.111104869842529e+01, 1.111110305786133e+01, 1.111111259460449e+01, 1.111110973358154e+01, 1.111111068725586e+01, 1.111111164093018e+01, 1.111111164093018e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01]
+forcedPump4.dp=[7.83562578125e+04, 1.213821796875e+05, 1.24970515625e+05, 1.252406171875e+05, 1.252608203125e+05, 1.25262203125e+05, 1.252623515625e+05, 1.252623359375e+05, 1.2526234375e+05, 1.2526234375e+05, 1.2526234375e+05, 1.25258453125e+05, 1.25248609375e+05, 1.252371328125e+05, 1.2522509375e+05, 1.252127421875e+05, 1.2520021875e+05, 1.251876484375e+05, 1.251751484375e+05, 1.251628515625e+05, 1.251508671875e+05, 1.251393203125e+05, 1.2512834375e+05, 1.251180546875e+05, 1.251085703125e+05, 1.251000234375e+05, 1.250925234375e+05, 1.250862109375e+05, 1.2508115625e+05, 1.25077015625e+05, 1.250732890625e+05, 1.250695234375e+05, 1.250652421875e+05, 1.250599765625e+05, 1.250532578125e+05, 1.25044625e+05, 1.25033609375e+05, 1.250197421875e+05, 1.25002546875e+05, 1.249815703125e+05, 1.249604296875e+05, 1.2495434375e+05, 1.249535390625e+05, 1.24953453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05]
+forcedPump1.dp=[7.83562578125e+04, 9.9008953125e+04, 1.006475859375e+05, 1.00770515625e+05, 1.00779703125e+05, 1.007803359375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007768984375e+05, 1.007680078125e+05, 1.007576015625e+05, 1.007466875e+05, 1.00735515625e+05, 1.0072421875e+05, 1.00712953125e+05, 1.007018515625e+05, 1.006910390625e+05, 1.006806640625e+05, 1.006708671875e+05, 1.006617734375e+05, 1.006535234375e+05, 1.006462578125e+05, 1.00640109375e+05, 1.006352109375e+05, 1.0063134375e+05, 1.0062796875e+05, 1.00624546875e+05, 1.00620578125e+05, 1.00615515625e+05, 1.00608859375e+05, 1.006000859375e+05, 1.005886640625e+05, 1.005740703125e+05, 1.00555796875e+05, 1.005333125e+05, 1.005061015625e+05, 1.00473640625e+05, 1.004353984375e+05, 1.00390828125e+05, 1.003189453125e+05, 1.002041640625e+05, 1.000486484375e+05, 9.98545390625e+04, 9.96240078125e+04, 9.93592109375e+04, 9.9062296875e+04, 9.87354296875e+04, 9.8380765625e+04, 9.800046875e+04, 9.75966875e+04, 9.71715625e+04, 9.67250625e+04, 9.62545234375e+04, 9.5757390625e+04, 9.52311015625e+04, 9.46731015625e+04, 9.40808359375e+04, 9.345175e+04, 9.27832890625e+04, 9.2072890625e+04, 9.13180078125e+04, 9.06400625e+04, 9.04562890625e+04, 9.04323515625e+04, 9.0429765625e+04, 9.0429546875e+04, 9.04295078125e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04]
+forcedPump5.dp=[7.83562578125e+04, 1.21476865234375e+04, 9.515435546875e+03, 9.3317216796875e+03, 9.3180654296875e+03, 9.3171279296875e+03, 9.3170302734375e+03, 9.3170390625e+03, 9.317033203125e+03, 9.317033203125e+03, 9.3170341796875e+03, 9.3158857421875e+03, 9.3128330078125e+03, 9.3093193359375e+03, 9.306072265625e+03, 9.30358203125e+03, 9.3021455078125e+03, 9.3006884765625e+03, 9.29749609375e+03, 9.2908525390625e+03, 9.2789912109375e+03, 9.2408076171875e+03, 9.164931640625e+03, 9.0584609375e+03, 8.928126953125e+03, 8.772828125e+03, 8.5843662109375e+03, 8.3542978515625e+03, 8.07286181640625e+03, 7.7413671875e+03, 7.36500390625e+03, 6.9387421875e+03, 6.53139453125e+03, 6.417529296875e+03, 6.40254248046875e+03, 6.40096142578125e+03, 6.400810546875e+03, 6.4007919921875e+03, 6.4007890625e+03, 6.400791015625e+03, 6.40079052734375e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03]
+forcedPump3.dp=[7.83562578125e+04, 4.512935546875e+04, 4.30141640625e+04, 4.285822265625e+04, 4.284658203125e+04, 4.284578125e+04, 4.284569921875e+04, 4.284570703125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.284337890625e+04, 4.283737890625e+04, 4.283029296875e+04, 4.28228984375e+04, 4.281548046875e+04, 4.28082578125e+04, 4.280144140625e+04, 4.27952421875e+04, 4.27898671875e+04, 4.27855234375e+04, 4.278239453125e+04, 4.278004296875e+04, 4.277765625e+04, 4.27744375e+04, 4.27695859375e+04, 4.27623046875e+04, 4.27517890625e+04, 4.273723828125e+04, 4.271786328125e+04, 4.26928515625e+04, 4.26557109375e+04, 4.25791640625e+04, 4.246258984375e+04, 4.230929296875e+04, 4.212258203125e+04, 4.1905765625e+04, 4.166216015625e+04, 4.139506640625e+04, 4.110669921875e+04, 4.07941484375e+04, 4.045346875e+04, 4.008073828125e+04, 3.967204296875e+04, 3.922345703125e+04, 3.873106640625e+04, 3.818964453125e+04, 3.759371875e+04, 3.694563671875e+04, 3.62483203125e+04, 3.55046875e+04, 3.471760546875e+04, 3.3885296875e+04, 3.3002796875e+04, 3.20663515625e+04, 3.1072205078125e+04, 3.00169296875e+04, 2.8903662109375e+04, 2.7728056640625e+04, 2.6481849609375e+04, 2.515678125e+04, 2.3734591796875e+04, 2.221242578125e+04, 2.0627994140625e+04, 1.9262244140625e+04, 1.890431640625e+04, 1.8858146484375e+04, 1.8853162109375e+04, 1.8852740234375e+04, 1.8852671875e+04, 1.88526875e+04, 1.8852681640625e+04, 1.88526796875e+04, 1.88526796875e+04, 1.8852681640625e+04, 1.8852681640625e+04, 1.8852681640625e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.8852681640625e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04]
+forcedPump2.dp=[7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.835315625e+04, 7.83452421875e+04, 7.83359609375e+04, 7.83262109375e+04, 7.8316265625e+04, 7.83062890625e+04, 7.82964296875e+04, 7.828684375e+04, 7.82776875e+04, 7.82691171875e+04, 7.82612890625e+04, 7.82543515625e+04, 7.824846875e+04, 7.8243796875e+04, 7.824025e+04, 7.8237234375e+04, 7.823415625e+04, 7.82304296875e+04, 7.82254609375e+04, 7.82186640625e+04, 7.82094375e+04, 7.81971953125e+04, 7.818134375e+04, 7.8161296875e+04, 7.81364609375e+04, 7.810625e+04, 7.80700625e+04, 7.80201171875e+04, 7.7929359375e+04, 7.779740625e+04, 7.76266875e+04, 7.74196640625e+04, 7.71787734375e+04, 7.69064609375e+04, 7.66051875e+04, 7.62773828125e+04, 7.59255078125e+04, 7.5551984375e+04, 7.51570390625e+04, 7.473771875e+04, 7.4291140625e+04, 7.3814390625e+04, 7.33045859375e+04, 7.2758828125e+04, 7.2174203125e+04, 7.15478203125e+04, 7.08767890625e+04, 7.01574765625e+04, 6.9383515625e+04, 6.855575e+04, 6.767634375e+04, 6.67474453125e+04, 6.577121875e+04, 6.47498125e+04, 6.3685390625e+04, 6.257675390625e+04, 6.1419390625e+04, 6.021051953125e+04, 5.89473671875e+04, 5.762715625e+04, 5.6247109375e+04, 5.48053046875e+04, 5.33065625e+04, 5.174723828125e+04, 5.012122265625e+04, 4.84224140625e+04, 4.664469921875e+04, 4.4778953125e+04, 4.28016875e+04, 4.073221875e+04, 3.85990703125e+04, 3.64307578125e+04, 3.42558046875e+04, 3.242510546875e+04, 3.1949908203125e+04, 3.18883203125e+04, 3.188183984375e+04, 3.188105078125e+04, 3.1881076171875e+04, 3.1881048828125e+04, 3.1881044921875e+04, 3.188104296875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04]
+pump3.P=[4.36944091796875e+02, 1.909871215820312e+02, 1.77718505859375e+02, 1.767529296875e+02, 1.766809234619141e+02, 1.766759796142578e+02, 1.766754608154297e+02, 1.766755065917969e+02, 1.766754760742188e+02, 1.766754760742188e+02, 1.766754913330078e+02, 1.789275207519531e+02, 1.843317718505859e+02, 1.902439880371094e+02, 1.961623992919922e+02, 2.020842590332031e+02, 2.080681762695312e+02, 2.141787872314453e+02, 2.204814758300781e+02, 2.270416564941406e+02, 2.339247131347656e+02, 2.412034301757812e+02, 2.489526977539062e+02, 2.570982360839844e+02, 2.655415954589844e+02, 2.741841735839844e+02, 2.829275512695312e+02, 2.916731872558594e+02, 3.003225402832031e+02, 3.087771606445312e+02, 3.169385070800781e+02, 3.247470703125e+02, 3.323451843261719e+02, 3.397773742675781e+02, 3.470662231445312e+02, 3.542343139648438e+02, 3.613042907714844e+02, 3.682987365722656e+02, 3.75240234375e+02, 3.821669311523438e+02, 3.890924987792969e+02, 3.959611511230469e+02, 4.0271533203125e+02, 4.092973937988281e+02, 4.156497802734375e+02, 4.217148742675781e+02, 4.274548950195312e+02, 4.329044799804688e+02, 4.380598449707031e+02, 4.429120178222656e+02, 4.474520568847656e+02, 4.516707763671875e+02, 4.55546875e+02, 4.590706787109375e+02, 4.622424926757812e+02, 4.650627136230469e+02, 4.675318603515625e+02, 4.696452331542969e+02, 4.713772277832031e+02, 4.726981811523438e+02, 4.735784912109375e+02, 4.739219970703125e+02, 4.737006225585938e+02, 4.731275939941406e+02, 4.725277404785156e+02, 4.723712768554688e+02, 4.723513793945312e+02, 4.723492431640625e+02, 4.723490600585938e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02]
+pump2.P=[4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.4106884765625e+02, 4.510079345703125e+02, 4.619131774902344e+02, 4.728125e+02, 4.836458740234375e+02, 4.944660949707031e+02, 5.053371276855469e+02, 5.163244018554688e+02, 5.274932250976562e+02, 5.389091186523438e+02, 5.506373901367188e+02, 5.627434692382812e+02, 5.752927856445312e+02, 5.883507690429688e+02, 6.020260620117188e+02, 6.163313598632812e+02, 6.311682739257812e+02, 6.464382934570312e+02, 6.620429077148438e+02, 6.778836059570312e+02, 6.938619384765625e+02, 7.098792724609375e+02, 7.258372802734375e+02, 7.416372680664062e+02, 7.571808471679688e+02, 7.723694458007812e+02, 7.871046142578125e+02, 8.013530883789062e+02, 8.153215942382812e+02, 8.290548095703125e+02, 8.425753784179688e+02, 8.559059448242188e+02, 8.690690307617188e+02, 8.820872802734375e+02, 8.949832763671875e+02, 9.077796630859375e+02, 9.204989624023438e+02, 9.331644897460938e+02, 9.4583837890625e+02, 9.585100708007812e+02, 9.711220092773438e+02, 9.836165771484375e+02, 9.959361572265625e+02, 1.008023193359375e+03, 1.019820068359375e+03, 1.031269287109375e+03, 1.042313110351562e+03, 1.05290673828125e+03, 1.063102294921875e+03, 1.072906860351562e+03, 1.082311401367188e+03, 1.091307006835938e+03, 1.099884643554688e+03, 1.108035400390625e+03, 1.115750366210938e+03, 1.123005981445312e+03, 1.129784912109375e+03, 1.136087524414062e+03, 1.141914184570312e+03, 1.147265380859375e+03, 1.152141357421875e+03, 1.15654296875e+03, 1.160464111328125e+03, 1.163878173828125e+03, 1.166755249023438e+03, 1.16906591796875e+03, 1.170780395507812e+03, 1.171843139648438e+03, 1.172058715820312e+03, 1.171569213867188e+03, 1.17059326171875e+03, 1.169349487304688e+03, 1.16805615234375e+03, 1.167082275390625e+03, 1.16686376953125e+03, 1.166836791992188e+03, 1.166833984375e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03]
+pump1.P=[4.36944091796875e+02, 6.206218872070312e+02, 6.360927734375e+02, 6.372584228515625e+02, 6.373456420898438e+02, 6.373516235351562e+02, 6.373522338867188e+02, 6.373521728515625e+02, 6.373522338867188e+02, 6.373522338867188e+02, 6.373521728515625e+02, 6.426600341796875e+02, 6.554691162109375e+02, 6.6954248046875e+02, 6.836113891601562e+02, 6.975792846679688e+02, 7.114954223632812e+02, 7.2542333984375e+02, 7.394284057617188e+02, 7.535760498046875e+02, 7.679315795898438e+02, 7.82560546875e+02, 7.975281982421875e+02, 8.129000854492188e+02, 8.287415771484375e+02, 8.451179809570312e+02, 8.620972290039062e+02, 8.79808349609375e+02, 8.982250366210938e+02, 9.17248779296875e+02, 9.367811279296875e+02, 9.567235107421875e+02, 9.769774169921875e+02, 9.974443969726562e+02, 1.01802587890625e+03, 1.038623413085938e+03, 1.059138427734375e+03, 1.079472412109375e+03, 1.099526977539062e+03, 1.119203491210938e+03, 1.138403442382812e+03, 1.15702880859375e+03, 1.175201293945312e+03, 1.193089233398438e+03, 1.210715209960938e+03, 1.228101806640625e+03, 1.245271728515625e+03, 1.262247436523438e+03, 1.279051635742188e+03, 1.295706909179688e+03, 1.31223583984375e+03, 1.328661010742188e+03, 1.345005004882812e+03, 1.36129150390625e+03, 1.377591186523438e+03, 1.393895751953125e+03, 1.4101474609375e+03, 1.426288818359375e+03, 1.44226220703125e+03, 1.458010131835938e+03, 1.473474731445312e+03, 1.488598754882812e+03, 1.503324340820312e+03, 1.517593994140625e+03, 1.52931201171875e+03, 1.532322631835938e+03, 1.532709838867188e+03, 1.532751708984375e+03, 1.532755249023438e+03, 1.532755737304688e+03, 1.532755615234375e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03]
+pump4.P=[4.36944091796875e+02, 8.424570922851562e+02, 8.800892944335938e+02, 8.82944091796875e+02, 8.831576538085938e+02, 8.831723022460938e+02, 8.83173828125e+02, 8.831737060546875e+02, 8.83173828125e+02, 8.83173828125e+02, 8.831737670898438e+02, 8.89773681640625e+02, 9.057192993164062e+02, 9.232597045898438e+02, 9.408016967773438e+02, 9.582093505859375e+02, 9.755277709960938e+02, 9.928199462890625e+02, 1.010151428222656e+03, 1.027587524414062e+03, 1.045193603515625e+03, 1.06303515625e+03, 1.081177490234375e+03, 1.09968603515625e+03, 1.118626220703125e+03, 1.1380634765625e+03, 1.158063110351562e+03, 1.178690673828125e+03, 1.200027587890625e+03, 1.222202880859375e+03, 1.245151489257812e+03, 1.26877490234375e+03, 1.292974487304688e+03, 1.317651733398438e+03, 1.342708251953125e+03, 1.36804541015625e+03, 1.393564819335938e+03, 1.419167846679688e+03, 1.444756103515625e+03, 1.470231079101562e+03, 1.491701416015625e+03, 1.497298706054688e+03, 1.49802197265625e+03, 1.498099487304688e+03, 1.498106689453125e+03, 1.498107543945312e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107543945312e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03]
+pump5.P=[4.36944091796875e+02, 2.667201232910156e+01, 1.849091339111328e+01, 1.795800399780273e+01, 1.79185962677002e+01, 1.79158935546875e+01, 1.791561317443848e+01, 1.79156379699707e+01, 1.791562080383301e+01, 1.791562080383301e+01, 1.791562271118164e+01, 1.840225219726562e+01, 1.955546760559082e+01, 2.08275203704834e+01, 2.21609935760498e+01, 2.360689544677734e+01, 2.523239135742188e+01, 2.703916931152344e+01, 2.893294715881348e+01, 3.081521606445312e+01, 3.258761978149414e+01, 3.423546981811523e+01, 3.581338500976562e+01, 3.734397125244141e+01, 3.885184860229492e+01, 4.034844207763672e+01, 4.178400039672852e+01, 4.310113525390625e+01, 4.427668380737305e+01, 4.531203079223633e+01, 4.619688415527344e+01, 4.69188346862793e+01, 4.740319061279297e+01, 4.75106201171875e+01, 4.752395248413086e+01, 4.752534866333008e+01, 4.752548217773438e+01, 4.752549743652344e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_Pump_stratos.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_Pump_stratos.txt
new file mode 100644
index 00000000..bba354d9
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_Pump_stratos.txt
@@ -0,0 +1,19 @@
+last-generated=2017-05-01
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1",
+ "number of continuous time states": "1",
+ "linear": " "
+}
+gain.u=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.8e-01, 9.6e-01, 9.399999999999999e-01, 9.2e-01, 9e-01, 8.8e-01, 8.6e-01, 8.4e-01, 8.2e-01, 8e-01, 7.8e-01, 7.6e-01, 7.4e-01, 7.2e-01, 7e-01, 6.8e-01, 6.6e-01, 6.4e-01, 6.2e-01, 6e-01, 5.8e-01, 5.600000000000001e-01, 5.4e-01, 5.2e-01, 5e-01, 4.799999701981039e-01, 4.59999970198246e-01, 4.399999403962078e-01, 4.200000298016828e-01, 4.00000029801967e-01, 3.800000000000709e-01, 3.600000000002133e-01, 3.399999701981751e-01, 3.199999403965277e-01, 3.00000059603579e-01, 2.800000298018961e-01, 2.599999999998579e-01, 2.399999850990164e-01, 2.199999701982105e-01, 1.999999552972269e-01, 1.800000596036677e-01, 1.600000298018249e-01, 1.400000149008946e-01, 1.199999925493573e-01, 9.999997764865798e-02, 7.99999552972359e-02, 6.00000558784486e-02, 4.000003725226355e-02, 2.000001862613177e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+time=[0e+00, 1e+00]
+floMacDyn.dpMachine=[3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.175175462589663e+04, 3.046894277120873e+04, 2.921257632038456e+04, 2.798266304942566e+04, 2.677920259389692e+04, 2.560218973122434e+04, 2.44516280946599e+04, 2.332752099141532e+04, 2.222985976376934e+04, 2.115865171471855e+04, 2.011389601065291e+04, 1.909558837114456e+04, 1.81037319564894e+04, 1.71383248135624e+04, 1.6199373600225e+04, 1.528686979652622e+04, 1.440081624174501e+04, 1.354121642757666e+04, 1.270806425827059e+04, 1.190136429163399e+04, 1.112111587663877e+04, 1.036731729484461e+04, 9.639968963234604e+03, 8.939073900524125e+03, 8.264626953125e+03, 7.616631721388508e+03, 6.995086735413406e+03, 6.399992971769178e+03, 5.831353248236336e+03, 5.289161278250607e+03, 4.773419554035097e+03, 4.284129055922066e+03, 3.821289537255766e+03, 3.384900752636182e+03, 2.974965307593178e+03, 2.591478072500489e+03, 2.234441815591066e+03, 1.903856417317854e+03, 1.599721877681727e+03, 1.3220709093367e+03, 1.071113789195938e+03, 8.47025868701382e+02, 6.498601797132555e+02, 4.795201047991868e+02, 3.356853025031859e+02, 2.176465073441913e+02, 1.241483650960707e+02, 5.548481001573464e+01, 1.389640859298925e+01, 7.052455442683041e-25, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
+floMacSta.dpMachine=[3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.30610234375e+04, 3.175175462589663e+04, 3.046894277120873e+04, 2.921257632038456e+04, 2.798266304942566e+04, 2.677920259389692e+04, 2.560218973122434e+04, 2.44516280946599e+04, 2.332752099141532e+04, 2.222985976376934e+04, 2.115865171471855e+04, 2.011389601065291e+04, 1.909558837114456e+04, 1.81037319564894e+04, 1.71383248135624e+04, 1.6199373600225e+04, 1.528686979652622e+04, 1.440081624174501e+04, 1.354121642757666e+04, 1.270806425827059e+04, 1.190136429163399e+04, 1.112111587663877e+04, 1.036731729484461e+04, 9.639968963234604e+03, 8.939073900524125e+03, 8.264626953125e+03, 7.616631721388508e+03, 6.995086735413406e+03, 6.399992971769178e+03, 5.831353248236336e+03, 5.289161278250607e+03, 4.773419554035097e+03, 4.284129055922066e+03, 3.821289537255766e+03, 3.384900752636182e+03, 2.974965307593178e+03, 2.591478072500489e+03, 2.234441815591066e+03, 1.903856417317854e+03, 1.599721877681727e+03, 1.3220709093367e+03, 1.071113789195938e+03, 8.47025868701382e+02, 6.498601797132555e+02, 4.795201047991868e+02, 3.356853025031859e+02, 2.176465073441913e+02, 1.241483650960707e+02, 5.548481001573464e+01, 1.389640859298925e+01, -2.754865407298063e-27, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
+floMacSta.VMachine_flow=[7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.573616310696272e-04, 7.419047344533203e-04, 7.264477335647658e-04, 7.1099079088356e-04, 6.955338360601819e-04, 6.800768351713152e-04, 6.646198924901095e-04, 6.491629376667313e-04, 6.337059949855254e-04, 6.182489940968324e-04, 6.027920974805253e-04, 5.873350965920749e-04, 5.718781539108691e-04, 5.564211530220024e-04, 5.409642564061116e-04, 5.255072555174186e-04, 5.100502546289335e-04, 4.945933580128345e-04, 4.791363862277983e-04, 4.636794144427621e-04, 4.482224887230929e-04, 4.327655169381782e-04, 4.173085160494676e-04, 4.018515903297638e-04, 3.863946185447276e-04, 3.709376467600498e-04, 3.554806749753719e-04, 3.400237031906941e-04, 3.245668235347532e-04, 3.091098517500754e-04, 2.936528799655074e-04, 2.781959081806158e-04, 2.627389363957992e-04, 2.472819355075338e-04, 2.318250704036816e-04, 2.163680986188303e-04, 2.00911112282272e-04, 1.854541404975248e-04, 1.699971687127775e-04, 1.545230545888811e-04, 1.389041111210654e-04, 1.229674358501591e-04, 1.065306615781079e-04, 8.939918496033541e-05, 7.139283811852446e-05, 5.246959914399264e-05, 3.313172087184439e-05, 1.568396595086643e-05, 3.992369022660811e-06, -7.923584057255752e-34, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
+floMacDyn.VMachine_flow=[7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.728186319582164e-04, 7.573616310696272e-04, 7.419047344533203e-04, 7.264477335647658e-04, 7.1099079088356e-04, 6.955338360601819e-04, 6.800768351713152e-04, 6.646198924901095e-04, 6.491629376667313e-04, 6.337059949855254e-04, 6.182489940968324e-04, 6.027920974805253e-04, 5.873350965920749e-04, 5.718781539108691e-04, 5.564211530220024e-04, 5.409642564061116e-04, 5.255072555174186e-04, 5.100502546289335e-04, 4.945933580128345e-04, 4.791363862277983e-04, 4.636794144427621e-04, 4.482224887230929e-04, 4.327655169381782e-04, 4.173085160494676e-04, 4.018515903297638e-04, 3.863946185447276e-04, 3.709376467600498e-04, 3.554806749753719e-04, 3.400237031906941e-04, 3.245668235347532e-04, 3.091098517500754e-04, 2.936528799655074e-04, 2.781959081806158e-04, 2.627389363957992e-04, 2.472819355075338e-04, 2.318250704036816e-04, 2.163680986188303e-04, 2.00911112282272e-04, 1.854541404975248e-04, 1.699971687127775e-04, 1.545230545888811e-04, 1.389041111210654e-04, 1.229674358501591e-04, 1.065306615781079e-04, 8.939918496033541e-05, 7.139283811852446e-05, 5.246959914399264e-05, 3.313172087184439e-05, 1.568396595086643e-05, 3.992369022660811e-06, 2.028437518657472e-31, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_SpeedControlled_Nrpm.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_SpeedControlled_Nrpm.txt
new file mode 100644
index 00000000..5e6c7e22
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_SpeedControlled_Nrpm.txt
@@ -0,0 +1,19 @@
+last-generated=2017-05-01
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 0, 1",
+ "number of continuous time states": "3",
+ "linear": " "
+}
+gain.u=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.8e-01, 9.6e-01, 9.399999999999999e-01, 9.2e-01, 9e-01, 8.8e-01, 8.6e-01, 8.4e-01, 8.2e-01, 8e-01, 7.8e-01, 7.6e-01, 7.4e-01, 7.2e-01, 7e-01, 6.8e-01, 6.6e-01, 6.4e-01, 6.2e-01, 6e-01, 5.8e-01, 5.600000000000001e-01, 5.4e-01, 5.2e-01, 5e-01, 4.799999701981039e-01, 4.59999970198246e-01, 4.399999403962078e-01, 4.200000298016828e-01, 4.00000029801967e-01, 3.800000000000709e-01, 3.600000000002133e-01, 3.399999701981751e-01, 3.199999403965277e-01, 3.00000059603579e-01, 2.800000298018961e-01, 2.599999999998579e-01, 2.399999850990164e-01, 2.199999701982105e-01, 1.999999552972269e-01, 1.800000596036677e-01, 1.600000298018249e-01, 1.400000149008946e-01, 1.199999925493573e-01, 9.999997764865798e-02, 7.99999552972359e-02, 6.00000558784486e-02, 4.000003725226355e-02, 2.000001862613177e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+time=[0e+00, 1e+00]
+floMacDyn.dpMachine=[3.819660034179688e+02, 4.766995551114627e+02, 4.943379824624175e+02, 4.981247254345277e+02, 4.989478454859282e+02, 4.991274413996107e+02, 4.991666564960233e+02, 4.991753540037698e+02, 4.99177215576281e+02, 4.991774291992188e+02, 4.99177490234375e+02, 4.991776123046966e+02, 4.991776733398438e+02, 4.991777038574219e+02, 4.991777038574219e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776428222656e+02, 4.991776428222656e+02, 4.991776428222656e+02, 4.991776428222656e+02, 4.991776428222656e+02, 4.819456914347608e+02, 4.630516866745697e+02, 4.441013206068409e+02, 4.254536894592623e+02, 4.071852938068841e+02, 3.893118938718313e+02, 3.718371458758588e+02, 3.547624123169213e+02, 3.380876218729161e+02, 3.218127345832193e+02, 3.059380412788723e+02, 2.904635693141461e+02, 2.753894887763743e+02, 2.607159827712439e+02, 2.464431999400378e+02, 2.325711621171876e+02, 2.191000040131373e+02, 2.060299012014906e+02, 1.933608521394113e+02, 1.810930337583667e+02, 1.692265570093825e+02, 1.577614580125583e+02, 1.466978491064055e+02, 1.36035883427912e+02, 1.257755584716797e+02, 1.159169982745177e+02, 1.064602790538257e+02, 9.740547710387663e+01, 8.875272665654923e+01, 8.05019780275438e+01, 7.265336792178633e+01, 6.520694980269032e+01, 5.816279611144667e+01, 5.152095642009812e+01, 4.52815277061184e+01, 3.945436522797682e+01, 3.410685593809134e+01, 2.925629970112054e+01, 2.486349086439177e+01, 2.089001718595297e+01, 1.730537361873739e+01, 1.40831064181975e+01, 1.11987877523382e+01, 8.628688242240919e+00, 6.353070134094843e+00, 4.361345678103525e+00, 2.662859173718023e+00, 1.305051941849334e+00, 3.723658880331966e-01, 3.075691893172916e-06, -1.554608619754159e-09, -6.348690568903696e-11, -1.693920607576424e-11, -1.286083800127601e-12, -7.744923442952546e-13, -3.197443157964285e-13, 6.394884621840902e-14, 6.394884621840902e-14, 7.105418040396313e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.623394503074558e-20, 6.394884621840902e-14, 7.105427357601002e-14, 6.394884621840902e-14, 6.394884621840902e-14, 6.394884621840902e-14, 6.394884621840902e-14]
+floMacSta.dpMachine=[4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.794398617743659e+02, 4.60098378735429e+02, 4.411532615168607e+02, 4.226047515662231e+02, 4.044529938614071e+02, 3.866980632772671e+02, 3.693401366808059e+02, 3.523794165633871e+02, 3.358159238354154e+02, 3.196498318150345e+02, 3.03881339468104e+02, 2.885104442652517e+02, 2.735373770073344e+02, 2.589621987299449e+02, 2.447850577938055e+02, 2.31006037638156e+02, 2.17625242166598e+02, 2.046428466961402e+02, 1.92058850206186e+02, 1.798734141037055e+02, 1.68086649106894e+02, 1.566985918106157e+02, 1.457093695701548e+02, 1.351190895372946e+02, 1.249277725219727e+02, 1.151355423425644e+02, 1.057424675876581e+02, 9.674862455141749e+01, 8.815413186832403e+01, 7.995896343619431e+01, 7.21632250871787e+01, 6.47669855429761e+01, 5.777030580097554e+01, 5.117323161869565e+01, 4.497585973124306e+01, 3.918022580065193e+01, 3.379532490656646e+01, 2.882868923497502e+01, 2.428444630137457e+01, 2.016343911214301e+01, 1.646309634831643e+01, 1.317693850012823e+01, 1.029396252050215e+01, 7.797536307782446e+00, 5.664503184096723e+00, 3.865953326378335e+00, 2.373942729492089e+00, 1.189011777832478e+00, 3.556552820124339e-01, 2.727178215989278e-16, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
+floMacSta.VMachine_flow=[8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.179551799330834e-01, 8.012098253604085e-01, 7.844675203252821e-01, 7.677283147381856e-01, 7.509921988664439e-01, 7.342589537458853e-01, 7.175286292588894e-01, 7.008012156472726e-01, 6.840764939988395e-01, 6.673544545648926e-01, 6.506350875641913e-01, 6.339182933405832e-01, 6.172039429126689e-01, 6.004920362800221e-01, 5.837825636319149e-01, 5.670753657677331e-01, 5.503703732797423e-01, 5.336675763383496e-01, 5.169668753863813e-01, 5.00268200996563e-01, 4.835715433205083e-01, 4.668767432339683e-01, 4.501837908951999e-01, 4.334926764397228e-01, 4.168032109737396e-01, 4.001154144414578e-01, 3.834291676330666e-01, 3.667444407458171e-01, 3.500612736084016e-01, 3.33379377938475e-01, 3.166987935734454e-01, 3.00019460908206e-01, 2.833413203380766e-01, 2.666642824562558e-01, 2.499884168513041e-01, 2.333011270105493e-01, 2.165425797956496e-01, 1.996426948237181e-01, 1.825317195393328e-01, 1.651394245822069e-01, 1.47396194194614e-01, 1.292373546042894e-01, 1.106163174348533e-01, 9.153306023404656e-02, 7.209600415124648e-02, 5.264118295486991e-02, 3.392443780500445e-02, 1.744533575602981e-02, 5.264308190498649e-03, 4.040264026751451e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
+floMacDyn.VMachine_flow=[1.030056595802307e+00, 8.7216740735283e-01, 8.427700395607741e-01, 8.364588020686494e-01, 8.350869416741311e-01, 8.347876072040732e-01, 8.347222804991619e-01, 8.347077369692162e-01, 8.347046375273059e-01, 8.347042798995972e-01, 8.34704160690352e-01, 8.347039818763555e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347039222717285e-01, 8.347038626672969e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.136936251909572e-01, 7.960825746137825e-01, 7.792405506055319e-01, 7.625672678357061e-01, 7.459324796546294e-01, 7.293086687615675e-01, 7.126896262523089e-01, 6.960732558690224e-01, 6.794594585702448e-01, 6.62848641509355e-01, 6.462407349682538e-01, 6.296354611416017e-01, 6.130328099245776e-01, 5.964327217121107e-01, 5.798350671509395e-01, 5.632396877072218e-01, 5.4664669245402e-01, 5.300559520173254e-01, 5.134674271136896e-01, 4.968809287725593e-01, 4.802965660196928e-01, 4.637141207955798e-01, 4.471335531218449e-01, 4.30554912403064e-01, 4.139779806137085e-01, 3.974027475606594e-01, 3.808291536381837e-01, 3.642571392416367e-01, 3.476867137257947e-01, 3.311176497556825e-01, 3.145499268930731e-01, 2.979834855327556e-01, 2.814182660701183e-01, 2.648541790976146e-01, 2.482912339266785e-01, 2.316703886620744e-01, 2.145470016825627e-01, 1.9667553029805e-01, 1.781489132197243e-01, 1.590906516778417e-01, 1.396061994858921e-01, 1.198104728362169e-01, 9.986110714079272e-02, 8.001040944168225e-02, 6.064564351885609e-02, 4.235008740178651e-02, 2.593029797545467e-02, 1.251978710299656e-02, 3.28057393959483e-03, -2.050461262115277e-05, 1.036404088589063e-08, 4.232498215483091e-10, 1.12894433862849e-10, 8.585223346750093e-12, 5.151052675123552e-12, 2.146312936332977e-12, -4.293351694117952e-13, -4.293537357870015e-13, -4.291618070624612e-13, 5.100472801097839e-17, 3.246207899968117e-17, 1.474160529900886e-17, -2.935298297555639e-18, -2.813662382803089e-17, -6.309053453777837e-17, 5.535739640962893e-17, 3.169104076017109e-17, -9.739985620690204e-17, 6.904193841893773e-17, -4.291720250938639e-13, -4.291406369030536e-13, -4.292561045224391e-13, -4.292275635888646e-13, -4.292408174969514e-13, -4.293443042497486e-13]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_SpeedControlled_y.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_SpeedControlled_y.txt
new file mode 100644
index 00000000..5e6c7e22
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_SpeedControlled_y.txt
@@ -0,0 +1,19 @@
+last-generated=2017-05-01
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 1, 1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1, 0, 1",
+ "number of continuous time states": "3",
+ "linear": " "
+}
+gain.u=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.8e-01, 9.6e-01, 9.399999999999999e-01, 9.2e-01, 9e-01, 8.8e-01, 8.6e-01, 8.4e-01, 8.2e-01, 8e-01, 7.8e-01, 7.6e-01, 7.4e-01, 7.2e-01, 7e-01, 6.8e-01, 6.6e-01, 6.4e-01, 6.2e-01, 6e-01, 5.8e-01, 5.600000000000001e-01, 5.4e-01, 5.2e-01, 5e-01, 4.799999701981039e-01, 4.59999970198246e-01, 4.399999403962078e-01, 4.200000298016828e-01, 4.00000029801967e-01, 3.800000000000709e-01, 3.600000000002133e-01, 3.399999701981751e-01, 3.199999403965277e-01, 3.00000059603579e-01, 2.800000298018961e-01, 2.599999999998579e-01, 2.399999850990164e-01, 2.199999701982105e-01, 1.999999552972269e-01, 1.800000596036677e-01, 1.600000298018249e-01, 1.400000149008946e-01, 1.199999925493573e-01, 9.999997764865798e-02, 7.99999552972359e-02, 6.00000558784486e-02, 4.000003725226355e-02, 2.000001862613177e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+time=[0e+00, 1e+00]
+floMacDyn.dpMachine=[3.819660034179688e+02, 4.766995551114627e+02, 4.943379824624175e+02, 4.981247254345277e+02, 4.989478454859282e+02, 4.991274413996107e+02, 4.991666564960233e+02, 4.991753540037698e+02, 4.99177215576281e+02, 4.991774291992188e+02, 4.99177490234375e+02, 4.991776123046966e+02, 4.991776733398438e+02, 4.991777038574219e+02, 4.991777038574219e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776428222656e+02, 4.991776428222656e+02, 4.991776428222656e+02, 4.991776428222656e+02, 4.991776428222656e+02, 4.819456914347608e+02, 4.630516866745697e+02, 4.441013206068409e+02, 4.254536894592623e+02, 4.071852938068841e+02, 3.893118938718313e+02, 3.718371458758588e+02, 3.547624123169213e+02, 3.380876218729161e+02, 3.218127345832193e+02, 3.059380412788723e+02, 2.904635693141461e+02, 2.753894887763743e+02, 2.607159827712439e+02, 2.464431999400378e+02, 2.325711621171876e+02, 2.191000040131373e+02, 2.060299012014906e+02, 1.933608521394113e+02, 1.810930337583667e+02, 1.692265570093825e+02, 1.577614580125583e+02, 1.466978491064055e+02, 1.36035883427912e+02, 1.257755584716797e+02, 1.159169982745177e+02, 1.064602790538257e+02, 9.740547710387663e+01, 8.875272665654923e+01, 8.05019780275438e+01, 7.265336792178633e+01, 6.520694980269032e+01, 5.816279611144667e+01, 5.152095642009812e+01, 4.52815277061184e+01, 3.945436522797682e+01, 3.410685593809134e+01, 2.925629970112054e+01, 2.486349086439177e+01, 2.089001718595297e+01, 1.730537361873739e+01, 1.40831064181975e+01, 1.11987877523382e+01, 8.628688242240919e+00, 6.353070134094843e+00, 4.361345678103525e+00, 2.662859173718023e+00, 1.305051941849334e+00, 3.723658880331966e-01, 3.075691893172916e-06, -1.554608619754159e-09, -6.348690568903696e-11, -1.693920607576424e-11, -1.286083800127601e-12, -7.744923442952546e-13, -3.197443157964285e-13, 6.394884621840902e-14, 6.394884621840902e-14, 7.105418040396313e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.623394503074558e-20, 6.394884621840902e-14, 7.105427357601002e-14, 6.394884621840902e-14, 6.394884621840902e-14, 6.394884621840902e-14, 6.394884621840902e-14]
+floMacSta.dpMachine=[4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.794398617743659e+02, 4.60098378735429e+02, 4.411532615168607e+02, 4.226047515662231e+02, 4.044529938614071e+02, 3.866980632772671e+02, 3.693401366808059e+02, 3.523794165633871e+02, 3.358159238354154e+02, 3.196498318150345e+02, 3.03881339468104e+02, 2.885104442652517e+02, 2.735373770073344e+02, 2.589621987299449e+02, 2.447850577938055e+02, 2.31006037638156e+02, 2.17625242166598e+02, 2.046428466961402e+02, 1.92058850206186e+02, 1.798734141037055e+02, 1.68086649106894e+02, 1.566985918106157e+02, 1.457093695701548e+02, 1.351190895372946e+02, 1.249277725219727e+02, 1.151355423425644e+02, 1.057424675876581e+02, 9.674862455141749e+01, 8.815413186832403e+01, 7.995896343619431e+01, 7.21632250871787e+01, 6.47669855429761e+01, 5.777030580097554e+01, 5.117323161869565e+01, 4.497585973124306e+01, 3.918022580065193e+01, 3.379532490656646e+01, 2.882868923497502e+01, 2.428444630137457e+01, 2.016343911214301e+01, 1.646309634831643e+01, 1.317693850012823e+01, 1.029396252050215e+01, 7.797536307782446e+00, 5.664503184096723e+00, 3.865953326378335e+00, 2.373942729492089e+00, 1.189011777832478e+00, 3.556552820124339e-01, 2.727178215989278e-16, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
+floMacSta.VMachine_flow=[8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.179551799330834e-01, 8.012098253604085e-01, 7.844675203252821e-01, 7.677283147381856e-01, 7.509921988664439e-01, 7.342589537458853e-01, 7.175286292588894e-01, 7.008012156472726e-01, 6.840764939988395e-01, 6.673544545648926e-01, 6.506350875641913e-01, 6.339182933405832e-01, 6.172039429126689e-01, 6.004920362800221e-01, 5.837825636319149e-01, 5.670753657677331e-01, 5.503703732797423e-01, 5.336675763383496e-01, 5.169668753863813e-01, 5.00268200996563e-01, 4.835715433205083e-01, 4.668767432339683e-01, 4.501837908951999e-01, 4.334926764397228e-01, 4.168032109737396e-01, 4.001154144414578e-01, 3.834291676330666e-01, 3.667444407458171e-01, 3.500612736084016e-01, 3.33379377938475e-01, 3.166987935734454e-01, 3.00019460908206e-01, 2.833413203380766e-01, 2.666642824562558e-01, 2.499884168513041e-01, 2.333011270105493e-01, 2.165425797956496e-01, 1.996426948237181e-01, 1.825317195393328e-01, 1.651394245822069e-01, 1.47396194194614e-01, 1.292373546042894e-01, 1.106163174348533e-01, 9.153306023404656e-02, 7.209600415124648e-02, 5.264118295486991e-02, 3.392443780500445e-02, 1.744533575602981e-02, 5.264308190498649e-03, 4.040264026751451e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
+floMacDyn.VMachine_flow=[1.030056595802307e+00, 8.7216740735283e-01, 8.427700395607741e-01, 8.364588020686494e-01, 8.350869416741311e-01, 8.347876072040732e-01, 8.347222804991619e-01, 8.347077369692162e-01, 8.347046375273059e-01, 8.347042798995972e-01, 8.34704160690352e-01, 8.347039818763555e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347039222717285e-01, 8.347038626672969e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.136936251909572e-01, 7.960825746137825e-01, 7.792405506055319e-01, 7.625672678357061e-01, 7.459324796546294e-01, 7.293086687615675e-01, 7.126896262523089e-01, 6.960732558690224e-01, 6.794594585702448e-01, 6.62848641509355e-01, 6.462407349682538e-01, 6.296354611416017e-01, 6.130328099245776e-01, 5.964327217121107e-01, 5.798350671509395e-01, 5.632396877072218e-01, 5.4664669245402e-01, 5.300559520173254e-01, 5.134674271136896e-01, 4.968809287725593e-01, 4.802965660196928e-01, 4.637141207955798e-01, 4.471335531218449e-01, 4.30554912403064e-01, 4.139779806137085e-01, 3.974027475606594e-01, 3.808291536381837e-01, 3.642571392416367e-01, 3.476867137257947e-01, 3.311176497556825e-01, 3.145499268930731e-01, 2.979834855327556e-01, 2.814182660701183e-01, 2.648541790976146e-01, 2.482912339266785e-01, 2.316703886620744e-01, 2.145470016825627e-01, 1.9667553029805e-01, 1.781489132197243e-01, 1.590906516778417e-01, 1.396061994858921e-01, 1.198104728362169e-01, 9.986110714079272e-02, 8.001040944168225e-02, 6.064564351885609e-02, 4.235008740178651e-02, 2.593029797545467e-02, 1.251978710299656e-02, 3.28057393959483e-03, -2.050461262115277e-05, 1.036404088589063e-08, 4.232498215483091e-10, 1.12894433862849e-10, 8.585223346750093e-12, 5.151052675123552e-12, 2.146312936332977e-12, -4.293351694117952e-13, -4.293537357870015e-13, -4.291618070624612e-13, 5.100472801097839e-17, 3.246207899968117e-17, 1.474160529900886e-17, -2.935298297555639e-18, -2.813662382803089e-17, -6.309053453777837e-17, 5.535739640962893e-17, 3.169104076017109e-17, -9.739985620690204e-17, 6.904193841893773e-17, -4.291720250938639e-13, -4.291406369030536e-13, -4.292561045224391e-13, -4.292275635888646e-13, -4.292408174969514e-13, -4.293443042497486e-13]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_SpeedControlled_y_linear.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_SpeedControlled_y_linear.txt
new file mode 100644
index 00000000..39cc8f76
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Movers_Validation_SpeedControlled_y_linear.txt
@@ -0,0 +1,15 @@
+last-generated=2017-05-01
+statistics-initialization=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1"
+}
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": " "
+}
+pumFixDp.m_flow=[9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.718034267425537e-01, 9.521689823754211e-01, 9.325305434182382e-01, 9.128876947933146e-01, 8.932402566014708e-01, 8.73587989395015e-01, 8.539302992010012e-01, 8.342670657633705e-01, 8.145978112686453e-01, 7.949220608514905e-01, 7.752393366771483e-01, 7.555491609954854e-01, 7.358508800037763e-01, 7.161438371122321e-01, 6.964273170625578e-01, 6.767006038015398e-01, 6.569626260715041e-01, 6.372124293639586e-01, 6.174489401118988e-01, 5.976707888156152e-01, 5.778764846267758e-01, 5.580644772929892e-01, 5.382326817697964e-01, 5.183790709007857e-01, 4.985011111625581e-01, 4.785957634449005e-01, 4.586596894684855e-01, 4.386888361102226e-01, 4.18678464785931e-01, 3.986230327303941e-01, 3.785155655500732e-01, 3.583479273782523e-01, 3.381101045954905e-01, 3.177896397987043e-01, 2.973710059312467e-01, 2.768346562120532e-01, 2.561549841077615e-01, 2.352989713839777e-01, 2.142222720463289e-01, 1.928644020879807e-01, 1.711403799223981e-01, 1.489272706315371e-01, 1.260348797068121e-01, 1.021518583640915e-01, 7.677125296149627e-02, 4.900504817281083e-02, 1.712740560872164e-02, -2.269826347116747e-02, -8.250392475654486e-02, -2.426746803668299e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01, -4.937616884708405e-01]
+time=[0e+00, 1e+00]
+pumFixM_flow.dp=[-1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.9899556640625e+04, -1.910956370888801e+04, -1.833557504228079e+04, -1.757758212084654e+04, -1.683558923259525e+04, -1.61095994906287e+04, -1.539960661306198e+04, -1.470561474486237e+04, -1.40276249040891e+04, -1.336563207039457e+04, -1.271964024568182e+04, -1.208964932955621e+04, -1.147565751628472e+04, -1.087766475849749e+04, -1.029567300931251e+04, -9.729681974168772e+03, -9.179690236429145e+03, -8.645698531111701e+03, -8.127707397168227e+03, -7.625715702917199e+03, -7.139723553191857e+03, -6.669732808724949e+03, -6.215740669680693e+03, -5.77774856382463e+03, -5.355757720556238e+03, -4.949765625e+03, -4.559773563018621e+03, -4.18578201983276e+03, -3.827789774746276e+03, -3.485800036493838e+03, -3.159807998163287e+03, -2.849815990351489e+03, -2.555824015341244e+03, -2.277832315751426e+03, -2.015840402540053e+03, -1.769849936455773e+03, -1.539858107930456e+03, -1.325866187853169e+03, -1.127874421888096e+03, -9.45882626931079e+02, -7.798908624912395e+02, -6.298999737455874e+02, -4.959081719221469e+02, -3.779164006159934e+02, -2.759246911065936e+02, -1.899329686280392e+02, -1.199412995540261e+02, -6.594992711313709e+01, -2.805618721113351e+01, -6.589824317141463e+00, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02, 2.511083893477917e-02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Conversions_Examples_To_VolumeFraction.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Conversions_Examples_To_VolumeFraction.txt
deleted file mode 100644
index 427b09a4..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Conversions_Examples_To_VolumeFraction.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-last-generated=2017-03-31
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "0",
- "number of continuous time states": "8",
- "linear": " "
-}
-limPID.u_m=[3.000003099441528e-01, 3.381264805793762e-01, 3.762543499469757e-01, 4.143800139427185e-01, 4.525034725666046e-01, 4.90624725818634e-01, 5.287437438964844e-01, 5.66860556602478e-01, 6.049752235412598e-01, 6.4308762550354e-01, 6.811978220939636e-01, 7.193058133125305e-01, 7.574115991592407e-01, 7.955151796340942e-01, 8.336165547370912e-01, 8.717156648635864e-01, 9.098126292228699e-01, 9.479073882102966e-01, 9.859998822212219e-01, 1.022360563278198e+00, 1.052048087120056e+00, 1.073057174682617e+00, 1.084619641304016e+00, 1.08714747428894e+00, 1.082001805305481e+00, 1.071127414703369e+00, 1.056636452674866e+00, 1.040510296821594e+00, 1.02440357208252e+00, 1.00956666469574e+00, 9.968477487564087e-01, 9.867402315139771e-01, 9.794454574584961e-01, 9.749360680580139e-01, 9.730125665664673e-01, 9.733501672744751e-01, 9.755390286445618e-01, 9.791185855865479e-01, 9.836097955703735e-01, 9.885448813438416e-01, 9.934950470924377e-01, 9.980944991111755e-01, 1.002058744430542e+00, 1.005195021629333e+00, 1.007404565811157e+00, 1.008676767349243e+00, 1.009075880050659e+00, 1.008723378181458e+00, 1.007778286933899e+00, 1.006416916847229e+00, 1.004816174507141e+00, 1.003138661384583e+00, 1.00152325630188e+00, 1.000079035758972e+00, 9.988826513290405e-01, 9.979787468910217e-01, 9.973823428153992e-01, 9.970835447311401e-01, 9.970523715019226e-01, 9.972444772720337e-01, 9.976069927215576e-01, 9.980835318565369e-01, 9.986191987991333e-01, 9.991641640663147e-01, 9.996764659881592e-01, 1.000123858451843e+00, 1.000484347343445e+00, 1.000746250152588e+00, 1.000907182693481e+00, 1.000972747802734e+00, 1.000954747200012e+00, 1.000869035720825e+00, 1.000733733177185e+00, 1.000567674636841e+00, 1.000388383865356e+00, 1.000211715698242e+00, 1.000050067901611e+00, 9.999128580093384e-01, 9.998061060905457e-01, 9.997322559356689e-01, 9.996912479400635e-01, 9.996804594993591e-01, 9.996955394744873e-01, 9.997302889823914e-01, 9.997785687446594e-01, 9.998345375061035e-01, 9.9989253282547e-01, 9.999483227729797e-01, 9.999980330467224e-01, 1.000039458274841e+00, 1.000070810317993e+00, 1.000091433525085e+00, 1.000101685523987e+00, 1.000102639198303e+00, 1.00009560585022e+00, 1.000082850456238e+00, 1.000066161155701e+00, 1.000047564506531e+00, 1.000028729438782e+00, 1.000011205673218e+00, 9.999957680702209e-01]
-limPID.u_s=[1e+00, 1e+00]
-time=[0e+00, 3.6e+04]
-limPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.539411097764969e-02, 1.702056974172592e-01, 2.882160842418671e-01, 4.068917632102966e-01, 5.158587694168091e-01, 6.077347993850708e-01, 6.783312559127808e-01, 7.262663841247559e-01, 7.523756623268127e-01, 7.590380907058716e-01, 7.49569833278656e-01, 7.277384996414185e-01, 6.97400689125061e-01, 6.622393131256104e-01, 6.255785226821899e-01, 5.902566313743591e-01, 5.585429668426514e-01, 5.320916771888733e-01, 5.119304060935974e-01, 4.984827041625977e-01, 4.916237890720367e-01, 4.90766316652298e-01, 4.949700832366943e-01, 5.030654668807983e-01, 5.137796998023987e-01, 5.258533954620361e-01, 5.381392240524292e-01, 5.4967200756073e-01, 5.597149133682251e-01, 5.677765607833862e-01, 5.736038088798523e-01, 5.771576166152954e-01, 5.785755515098572e-01, 5.781295299530029e-01, 5.761805176734924e-01, 5.731368064880371e-01, 5.694149732589722e-01, 5.654079914093018e-01, 5.614609718322754e-01, 5.578550100326538e-01, 5.547972917556763e-01, 5.524191856384277e-01, 5.507792234420776e-01, 5.498703122138977e-01, 5.496331453323364e-01, 5.499683618545532e-01, 5.50751805305481e-01, 5.51847517490387e-01, 5.531198382377625e-01, 5.544435381889343e-01, 5.557112693786621e-01, 5.568386912345886e-01, 5.577666759490967e-01, 5.584611296653748e-01, 5.589113235473633e-01, 5.591264963150024e-01, 5.591316223144531e-01, 5.589630603790283e-01, 5.586634278297424e-01, 5.582779049873352e-01, 5.578500032424927e-01, 5.574192404747009e-01, 5.570192337036133e-01, 5.566750764846802e-01, 5.564008355140686e-01, 5.562042593955994e-01, 5.560857653617859e-01, 5.560402870178223e-01, 5.560572743415833e-01, 5.561257600784302e-01, 5.562319159507751e-01, 5.563617944717407e-01, 5.565016865730286e-01, 5.566393136978149e-01, 5.567646622657776e-01, 5.568703413009644e-01, 5.569522380828857e-01, 5.570080280303955e-01, 5.570388436317444e-01, 5.570464730262756e-01, 5.570346713066101e-01, 5.570076107978821e-01]
-conVolFlo.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.750288009643555e+00, 7.185765266418457e+00, 1.216803359985352e+01, 1.717818450927734e+01, 2.17783374786377e+01, 2.565685272216797e+01, 2.863698577880859e+01, 3.066044235229492e+01, 3.17625617980957e+01, 3.204378890991211e+01, 3.164411735534668e+01, 3.072257804870605e+01, 2.944194602966309e+01, 2.795768356323242e+01, 2.641010475158691e+01, 2.491902542114258e+01, 2.358024406433105e+01, 2.24636058807373e+01, 2.161249160766602e+01, 2.104479217529297e+01, 2.07552375793457e+01, 2.071903991699219e+01, 2.089650535583496e+01, 2.123825454711914e+01, 2.169057083129883e+01, 2.220024490356445e+01, 2.271891593933105e+01, 2.320575714111328e+01, 2.362972450256348e+01, 2.397004508972168e+01, 2.421603012084961e+01, 2.436606979370117e+01, 2.442591094970703e+01, 2.440708541870117e+01, 2.432481384277344e+01, 2.419631958007812e+01, 2.403920936584473e+01, 2.387005043029785e+01, 2.370343208312988e+01, 2.355120468139648e+01, 2.342212677001953e+01, 2.332173538208008e+01, 2.325250244140625e+01, 2.321413421630859e+01, 2.320412254333496e+01, 2.32182731628418e+01, 2.325134658813477e+01, 2.32976016998291e+01, 2.33513126373291e+01, 2.340719223022461e+01, 2.346070861816406e+01, 2.350830268859863e+01, 2.354747772216797e+01, 2.35767936706543e+01, 2.359579849243164e+01, 2.360488128662109e+01, 2.360509872436523e+01, 2.359798240661621e+01, 2.358533477783203e+01, 2.356905937194824e+01, 2.355099487304688e+01, 2.353281021118164e+01, 2.351592636108398e+01, 2.350139617919922e+01, 2.348981857299805e+01, 2.348151969909668e+01, 2.347652053833008e+01, 2.34745979309082e+01, 2.347531700134277e+01, 2.347820663452148e+01, 2.348268699645996e+01, 2.34881706237793e+01, 2.349407577514648e+01, 2.349988555908203e+01, 2.350517654418945e+01, 2.350963973999023e+01, 2.351309585571289e+01, 2.351545143127441e+01, 2.351675224304199e+01, 2.351707458496094e+01, 2.351657676696777e+01, 2.351543426513672e+01]
-conMasVolFra.V=[3.0000030528754e-04, 3.381264687050134e-04, 3.762543492484838e-04, 4.143800179008394e-04, 4.525034746620804e-04, 4.906246904283762e-04, 5.287437816150486e-04, 5.668606027029455e-04, 6.049752118997276e-04, 6.43087609205395e-04, 6.811977946199477e-04, 7.193058263510466e-04, 7.574115879833698e-04, 7.955151377245784e-04, 8.336165337823332e-04, 8.717156597413123e-04, 9.098126320168376e-04, 9.479073924012482e-04, 9.859999408945441e-04, 1.02236052043736e-03, 1.052048057317734e-03, 1.073057181201875e-03, 1.084619667381048e-03, 1.087147393263876e-03, 1.082001836039126e-03, 1.07112736441195e-03, 1.056636450812221e-03, 1.04051036760211e-03, 1.024403609335423e-03, 1.009566709399223e-03, 9.968477534130216e-04, 9.867402259260416e-04, 9.794454090297222e-04, 9.749360615387559e-04, 9.730125311762094e-04, 9.733501938171685e-04, 9.755390346981585e-04, 9.79118631221354e-04, 9.836098179221153e-04, 9.885448962450027e-04, 9.934949921444058e-04, 9.98094561509788e-04, 1.002058736048639e-03, 1.005194964818656e-03, 1.007404644042253e-03, 1.008676830679178e-03, 1.009075785987079e-03, 1.008723396807909e-03, 1.007778220809996e-03, 1.006416976451874e-03, 1.004816265776753e-03, 1.003138604573905e-03, 1.001523225568235e-03, 1.00007897708565e-03, 9.988826932385564e-04, 9.979787282645702e-04, 9.973823325708508e-04, 9.970836108550429e-04, 9.970524115487933e-04, 9.972444968298078e-04, 9.976070141419768e-04, 9.980835020542145e-04, 9.98619245365262e-04, 9.991641854867339e-04, 9.996765293180943e-04, 1.000123913399875e-03, 1.000484335236251e-03, 1.000746269710362e-03, 1.000907155685127e-03, 1.000972697511315e-03, 1.000954769551754e-03, 1.000868971459568e-03, 1.000733696855605e-03, 1.000567688606679e-03, 1.000388409011066e-03, 1.000211690552533e-03, 1.000049989670515e-03, 9.999128524214029e-04, 9.998060995712876e-04, 9.997322922572494e-04, 9.996911976486444e-04, 9.996804874390364e-04, 9.99695505015552e-04, 9.997303131967783e-04, 9.997786255553365e-04, 9.998345049098134e-04, 9.998924797400832e-04, 9.999483590945601e-04, 9.999980684369802e-04, 1.000039512291551e-03, 1.000070828013122e-03, 1.000091433525085e-03, 1.000101794488728e-03, 1.000102609395981e-03, 1.000095624476671e-03, 1.00008281879127e-03, 1.000066171400249e-03, 1.000047544948757e-03, 1.000028802081943e-03, 1.000011106953025e-03, 9.999957401305437e-04]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_Density.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_Density.txt
deleted file mode 100644
index e75b6d5d..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_Density.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-last-generated=2015-08-05
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "0",
- "number of continuous time states": "4",
- "linear": " "
-}
-masFloRat.ports[1].m_flow=[-10., -9.80000019868213989582, -9.60000039736428334436, -9.39999960263571665564, -9.19999984105421830805, -9., -8.80000015894578346831, -8.6000003178916912816, -8.3999996821083087184, -8.19999984105428048053, -8., -7.80000015894571951947, -7.59999984105453307848, -7.40000015894546692152, -7.19999968210957153048, -7., -6.80000031789042846952, -6.59999984105427994763, -6.40000015894572005237, -6.19999968210957153048, -6., -5.80000031789042846952, -5.59999984105428083581, -5.40000015894571916419, -5.19999968210957241865, -5., -4.80000031789042758135, -4.60000015894369695957, -4.39999984105630126408, -4.19999968210957241865, -4., -3.80000007947184847978, -3.6000001589452144124, -3.3999998410547855876, -3.19999992052815018795, -3., -2.80000007947184981205, -2.6000001589452144124, -2.3999998410547855876, -2.19999992052815018795, -2., -1.80000007947222884219, -1.60000027815298806466, -1.39999972184701193534, -1.19999992052777226803, -1., -0.80000013907649347722, -0.60000027815298806466, -0.3999997516491459737, -0.19999987582452563584, 0., 0.19999987582452563584, 0.3999997516491459737, 0.60000027815298806466, 0.79999950330599722825, 1., 1.20000055629789215139, 1.39999972184296850308, 1.60000027815702905443, 1.79999944370210784861, 2., 2.20000055629789192935, 2.39999984105074437579, 2.60000015894925562421, 2.79999944370210807065, 3., 3.20000055629789192935, 3.39999984105074437579, 3.60000015894925784465, 3.79999944370210807065, 4., 4.20000031787931060734, 4.39999984105225827591, 4.60000015894773994773, 4.79999968212068672813, 5., 5.20000031787931327187, 5.39999984105226005227, 5.60000015894774172409, 5.79999968212068939266, 6., 6.20000031787931327187, 6.39999984105225827591, 6.60000015894773994773, 6.79999968212068672813, 7., 7.20000031787931327187, 7.39999984105226005227, 7.60000015894773994773, 7.79999968212068672813, 8., 8.20000031787931327187, 8.39999936421510184914, 8.60000063578489992722, 8.79999968212068672813, 9., 9.20000031787930971916, 9.39999936421510007278, 9.60000063578489815086, 9.79999968212068672813, 10.]
-time=[0., 60.]
-senDenVol.d=[1.20000004768371582031, 1.20227491855990820113, 1.20218300820121726247, 1.20209300517330075486, 1.20200514794779178551, 1.20191931724548339844, 1.20183491705512324188, 1.20175373551709685493, 1.20167493822691540117, 1.20159602166482204488, 1.20151722431182861328, 1.20144534109952405565, 1.20137774942164332614, 1.20131015779728977932, 1.20124256606550283699, 1.20117497444152832031, 1.20110738281717477349, 1.20103979108557723521, 1.20097219946141353653, 1.20091438290046448323, 1.20086050033569335938, 1.20080661777130126566, 1.20075273512088642747, 1.20069885255630492971, 1.2006449699060797176, 1.20059108734130859375, 1.20053720477691650004, 1.2004954815411106317, 1.20045626158556273388, 1.20041716096284312165, 1.20037794113159179688, 1.20033884050963002288, 1.2002996206783786981, 1.20026051993136251284, 1.20022130010655336818, 1.20019745826721191406, 1.20017826558296292205, 1.20016276838214230871, 1.20015108583462892788, 1.20013606547361950661, 1.20012164115905761719, 1.20010781289018564344, 1.20009446145771403458, 1.20008182524043172101, 1.20006966590123442806, 1.20005774497985839844, 1.20004594326777191959, 1.20003426076497499153, 1.20002281664361976077, 1.20001137255902312617, 1.20000004768371582031, 1.19998860359911896367, 1.19997715951528016731, 1.19996571539392493655, 1.19995415213603884297, 1.19994235038757324219, 1.19993031021749696485, 1.19991803170842126214, 1.19990527628260656989, 1.19989216331001968818, 1.19987833499908447266, 1.19986379142786447893, 1.19984817506929197783, 1.19983088967834783389, 1.19981122022212005618, 1.199787139892578125, 1.19975697986046903054, 1.19972503189289181336, 1.19969296450684193012, 1.19965565214169833652, 1.19961845874786376953, 1.19958114614473965176, 1.19953787332800310139, 1.19949090474816877361, 1.19944393646770874895, 1.19939708709716796875, 1.19935011851733763777, 1.19930315023687761311, 1.19925618165552760885, 1.19919908061880309269, 1.19913995265960693359, 1.19908070549263690019, 1.19902157791011698684, 1.1989623307431422905, 1.19890320316062237715, 1.19884347915649414062, 1.19877183419157939959, 1.1987003088906940107, 1.19862866392577327446, 1.19855713862488788557, 1.19848549365997314453, 1.19841396790434795427, 1.19834041605539298736, 1.19826006878959767654, 1.19817757627727394798, 1.19809293746948242188, 1.19800627209164201048, 1.19791734230041990727, 1.19782638538056951383, 1.19773328328240258323, 1.19763815402984619141]
-senDenFlo.d=[1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031, 1.20000004768371582031]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_EnthalpyFlowRate.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_EnthalpyFlowRate.txt
deleted file mode 100644
index c66ab591..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_EnthalpyFlowRate.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-last-generated=2017-03-31
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "2",
- "linear": " "
-}
-senM_flow.m_flow=[1e+00, 9.800000198682163e-01, 9.599999801317882e-01, 9.399999960263539e-01, 9.200000198682181e-01, 8.999999761581421e-01, 8.799999920527108e-01, 8.600000079472923e-01, 8.399999801317788e-01, 8.199999960263665e-01, 8.00000011920929e-01, 7.79999968210894e-01, 7.599999841054343e-01, 7.400000158945657e-01, 7.200000158946351e-01, 6.99999988079071e-01, 6.800000198681517e-01, 6.600000198681959e-01, 6.399999920527331e-01, 6.199999920527772e-01, 6.000000238418579e-01, 5.799999960262938e-01, 5.599999960263381e-01, 5.400000278155198e-01, 5.199999682109193e-01, 5e-01, 4.800000019867583e-01, 4.600000337756495e-01, 4.399999721846254e-01, 4.199999741714786e-01, 4.000000059604645e-01, 3.800000079472228e-01, 3.600000397361141e-01, 3.399999781450899e-01, 3.199999801319429e-01, 3.00000011920929e-01, 2.800000139076874e-01, 2.600000158944457e-01, 2.399999692044879e-01, 2.1999998609236e-01, 2.000000029802322e-01, 1.800000198681045e-01, 1.600000218549101e-01, 1.399999751649524e-01, 1.199999846022203e-01, 1.000000014901161e-01, 8.000001092743132e-02, 6.000002409006062e-02, 3.9999973674789e-02, 1.999998683740042e-02, 0e+00, -1.999998683740042e-02, -3.9999973674789e-02, -6.000002409006062e-02, -7.999994735038643e-02, -1.000000014901161e-01, -1.200000481792654e-01, -1.39999975164548e-01, -1.600000218553142e-01, -1.799999562909882e-01, -2.000000029802322e-01, -2.200000496694763e-01, -2.399999692040838e-01, -2.600000158948497e-01, -2.799999503305237e-01, -3.00000011920929e-01, -3.200000437090118e-01, -3.399999781446858e-01, -3.600000397365184e-01, -3.799999443700592e-01, -4.000000059604645e-01, -4.200000377485471e-01, -4.39999972184221e-01, -4.600000337760537e-01, -4.799999384099737e-01, -5e-01, -5.200000317880829e-01, -5.399999960260792e-01, -5.60000027815779e-01, -5.799999324491305e-01, -6.000000238418579e-01, -6.200000556299408e-01, -6.399999602632921e-01, -6.600000516572576e-01, -6.799999562909882e-01, -6.99999988079071e-01, -7.200000794710408e-01, -7.399999841051502e-01, -7.600000158948498e-01, -7.799999205289592e-01, -8.00000011920929e-01, -8.200000437090118e-01, -8.399999483427424e-01, -8.600000397367079e-01, -8.799999443700592e-01, -8.999999761581421e-01, -9.200000675508695e-01, -9.39999972184221e-01, -9.600000039739208e-01, -9.799999682119171e-01, -1e+00]
-time=[0e+00, 6e+01]
-senH.h_out=[4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53010234375e+04, 4.536201164928624e+04, 4.554320283410653e+04, 4.58416684349544e+04, 4.625207697147785e+04, 4.6767265625e+04, 4.737834543905764e+04, 4.80749951677836e+04, 4.884578227987808e+04, 4.967841579611108e+04, 5.056012109375e+04, 5.14779086245947e+04, 5.241892067045392e+04, 5.337073558687255e+04, 5.432159524589333e+04, 5.526065234375e+04, 5.61781116653554e+04, 5.706540513940658e+04, 5.791526276737889e+04, 5.872175190243738e+04, 5.948029296875e+04, 6.018760718676489e+04, 6.084163982082684e+04, 6.144150072139646e+04, 6.198729554152561e+04, 6.2480046875e+04, 6.292150495318163e+04, 6.331403858739708e+04, 6.366049259462819e+04, 6.396404614461147e+04, 6.422809375e+04, 6.445614115397912e+04, 6.465171070426991e+04, 6.481825409775646e+04, 6.495909732227295e+04, 6.507739453125e+04, 6.517607053660833e+04, 6.525782412263665e+04, 6.532510554452308e+04, 6.538010534015593e+04, 6.542476171875e+04, 6.546078523641641e+04, 6.548965231027176e+04, 6.551263283785703e+04, 6.553080464557902e+04, 6.55450859375e+04, 6.555623439923867e+04, 6.556487499011548e+04, 6.55715390697023e+04, 6.557664061337736e+04, 6.5580515625e+04]
-senH_flow.H_flow=[4.53009453125e+04, 4.439492581725182e+04, 4.348890632200365e+04, 4.258288664674635e+04, 4.167687123775716e+04, 4.07708515625e+04, 3.986483188724284e+04, 3.895881221198626e+04, 3.805279325676374e+04, 3.714677358151055e+04, 3.62407578125e+04, 3.533473813724256e+04, 3.442871846198626e+04, 3.352269950676374e+04, 3.261667911147481e+04, 3.1710662109375e+04, 3.080464315415019e+04, 2.989862275886011e+04, 2.899260575676489e+04, 2.808658536147481e+04, 2.718056640625e+04, 2.627454940415019e+04, 2.536852900886011e+04, 2.446251005364299e+04, 2.35564916114686e+04, 2.265047265625e+04, 2.17444537010314e+04, 2.083843669892538e+04, 1.993241486357461e+04, 1.902639590834981e+04, 1.812037890625e+04, 1.721435995102519e+04, 1.63083409958128e+04, 1.540232013700591e+04, 1.44963021583467e+04, 1.3590283203125e+04, 1.26842652244658e+04, 1.177824724580039e+04, 1.087222541044961e+04, 9.9662074317842e+03, 9.060189453125e+03, 8.1541704979033e+03, 7.248152519240991e+03, 6.342131172165259e+03, 5.436112705223257e+03, 4.5300947265625e+03, 3.624076259620493e+03, 2.718057792680043e+03, 1.812036689741837e+03, 9.060183448711126e+02, 0e+00, -9.072396564598199e+02, -1.821726980726496e+03, -2.750501195643739e+03, -3.700164063788309e+03, -4.6767265625e+03, -5.685403986360537e+03, -6.730498163167173e+03, -7.815326606433976e+03, -8.942112325275464e+03, -1.01120244140625e+04, -1.132514279858264e+04, -1.25805393982572e+04, -1.387639327879625e+04, -1.521004442343014e+04, -1.65781953125e+04, -1.797699969311761e+04, -1.940223645683493e+04, -2.084949599520279e+04, -2.231426188489414e+04, -2.37921171875e+04, -2.527879871152607e+04, -2.677032036769687e+04, -2.826309174101998e+04, -2.975389855625953e+04, -3.12400234375e+04, -3.271918538949751e+04, -3.418958016642759e+04, -3.564987684860485e+04, -3.70991408573038e+04, -3.853685546875e+04, -3.996281220213261e+04, -4.137709195747368e+04, -4.27800486505885e+04, -4.417218397029372e+04, -4.555417578125e+04, -4.692677300845572e+04, -4.829079123838693e+04, -4.96470837504371e+04, -5.099647704364748e+04, -5.233980859375e+04, -5.367784714549956e+04, -5.501130690026763e+04, -5.634086496924374e+04, -5.766710600527886e+04, -5.8990578125e+04, -6.031173773175741e+04, -6.163098269833125e+04, -6.294867745578289e+04, -6.426510212212513e+04, -6.5580515625e+04]
-cheEqu.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_EntropyFlowRate.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_EntropyFlowRate.txt
new file mode 100644
index 00000000..5f027d44
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_EntropyFlowRate.txt
@@ -0,0 +1,12 @@
+last-generated=2017-03-31
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "2",
+ "linear": " "
+}
+senM_flow.m_flow=[1e+00, 9.800000198682163e-01, 9.599999801317882e-01, 9.399999960263539e-01, 9.200000198682181e-01, 8.999999761581421e-01, 8.799999920527108e-01, 8.600000079472923e-01, 8.399999801317788e-01, 8.199999960263665e-01, 8.00000011920929e-01, 7.79999968210894e-01, 7.599999841054343e-01, 7.400000158945657e-01, 7.200000158946351e-01, 6.99999988079071e-01, 6.800000198681517e-01, 6.600000198681959e-01, 6.399999920527331e-01, 6.199999920527772e-01, 6.000000238418579e-01, 5.799999960262938e-01, 5.599999960263381e-01, 5.400000278155198e-01, 5.199999682109193e-01, 5e-01, 4.800000019867583e-01, 4.600000337756495e-01, 4.399999721846254e-01, 4.199999741714786e-01, 4.000000059604645e-01, 3.800000079472228e-01, 3.600000397361141e-01, 3.399999781450899e-01, 3.199999801319429e-01, 3.00000011920929e-01, 2.800000139076874e-01, 2.600000158944457e-01, 2.399999692044879e-01, 2.1999998609236e-01, 2.000000029802322e-01, 1.800000198681045e-01, 1.600000218549101e-01, 1.399999751649524e-01, 1.199999846022203e-01, 1.000000014901161e-01, 8.000001092743132e-02, 6.000002409006062e-02, 3.9999973674789e-02, 1.999998683740042e-02, 0e+00, -1.999998683740042e-02, -3.9999973674789e-02, -6.000002409006062e-02, -7.999994735038643e-02, -1.000000014901161e-01, -1.200000481792654e-01, -1.39999975164548e-01, -1.600000218553142e-01, -1.799999562909882e-01, -2.000000029802322e-01, -2.200000496694763e-01, -2.399999692040838e-01, -2.600000158948497e-01, -2.799999503305237e-01, -3.00000011920929e-01, -3.200000437090118e-01, -3.399999781446858e-01, -3.600000397365184e-01, -3.799999443700592e-01, -4.000000059604645e-01, -4.200000377485471e-01, -4.39999972184221e-01, -4.600000337760537e-01, -4.799999384099737e-01, -5e-01, -5.200000317880829e-01, -5.399999960260792e-01, -5.60000027815779e-01, -5.799999324491305e-01, -6.000000238418579e-01, -6.200000556299408e-01, -6.399999602632921e-01, -6.600000516572576e-01, -6.799999562909882e-01, -6.99999988079071e-01, -7.200000794710408e-01, -7.399999841051502e-01, -7.600000158948498e-01, -7.799999205289592e-01, -8.00000011920929e-01, -8.200000437090118e-01, -8.399999483427424e-01, -8.600000397367079e-01, -8.799999443700592e-01, -8.999999761581421e-01, -9.200000675508695e-01, -9.39999972184221e-01, -9.600000039739208e-01, -9.799999682119171e-01, -1e+00]
+time=[0e+00, 6e+01]
+senS_flow.S_flow=[9.535915374755859e+01, 9.34519730372094e+01, 9.154478469746876e+01, 8.963760360819531e+01, 8.773042327676708e+01, 8.582323455810547e+01, 8.391605346883232e+01, 8.200887237956037e+01, 8.010169280597437e+01, 7.819450408732062e+01, 7.628732299804688e+01, 7.438014190877313e+01, 7.247295319011938e+01, 7.056577361653336e+01, 6.865859101156698e+01, 6.675140380859375e+01, 6.484422423501505e+01, 6.293704163004625e+01, 6.102985824177386e+01, 5.912267182212599e+01, 5.721549224853516e+01, 5.530830886025919e+01, 5.340112625529039e+01, 5.149394286701799e+01, 4.958675644737013e+01, 4.76795768737793e+01, 4.577239348550332e+01, 4.386521391190036e+01, 4.195802446090236e+01, 4.005084488729941e+01, 3.814366149902344e+01, 3.623647811074746e+01, 3.432929853714452e+01, 3.24221090861465e+01, 3.051492760520097e+01, 2.860774612426758e+01, 2.670056464332812e+01, 2.479338125505215e+01, 2.288619371139064e+01, 2.097901223044511e+01, 1.907183074951172e+01, 1.716464926857226e+01, 1.525746683396454e+01, 1.335027929029697e+01, 1.144309685569229e+01, 9.535915374755859e+00, 7.628733416983782e+00, 5.721551459211716e+00, 3.814363677127092e+00, 1.907181838563546e+00, 0e+00, -1.911202761675783e+00, -3.846327209051269e+00, -5.828592961992019e+00, -7.879797881657132e+00, -1.001976203918457e+01, -1.226569955446131e+01, -1.463181951256462e+01, -1.712905067375694e+01, -1.976474458768549e+01, -2.254273796081543e+01, -2.546330834703472e+01, -2.852340302187676e+01, -3.17169955826618e+01, -3.50353193520393e+01, -3.846748733520508e+01, -4.200079876675807e+01, -4.562134087624379e+01, -4.931456086513795e+01, -5.306556124243674e+01, -5.685974884033203e+01, -6.068305418601557e+01, -6.452234161024791e+01, -6.836575042863338e+01, -7.220268037922013e+01, -7.602414703369141e+01, -7.982264908305476e+01, -8.359221171460248e+01, -8.732846541695312e+01, -9.102831094176616e+01, -9.469004058837891e+01, -9.831296691807222e+01, -1.01897387734409e+02, -1.054444319728947e+02, -1.089557558759017e+02, -1.124336013793945e+02, -1.158804561089436e+02, -1.192989763794857e+02, -1.226920132687562e+02, -1.260622930862996e+02, -1.294125518798828e+02, -1.327453392621058e+02, -1.360630298458674e+02, -1.393678325627489e+02, -1.426617042799067e+02, -1.459464263916016e+02, -1.492235190660805e+02, -1.524943195742107e+02, -1.557599833972229e+02, -1.590214608256895e+02, -1.622796173095703e+02]
+senS.s=[9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535941314697266e+01, 9.556020332298228e+01, 9.615824031194101e+01, 9.714317475628818e+01, 9.849753189896954e+01, 1.001976165771484e+02, 1.02214116901963e+02, 1.045130126914319e+02, 1.070565448414041e+02, 1.098041691610989e+02, 1.127136917114258e+02, 1.157422868886644e+02, 1.188475225754505e+02, 1.219884302075435e+02, 1.2512616697296e+02, 1.282249450683594e+02, 1.312524642229368e+02, 1.341804315157801e+02, 1.369848820004183e+02, 1.39646233621942e+02, 1.421493682861328e+02, 1.444834498831636e+02, 1.466417057202155e+02, 1.486211876832549e+02, 1.504222673281172e+02, 1.520482940673828e+02, 1.535050693727084e+02, 1.548003982125332e+02, 1.559436811530151e+02, 1.569453711250262e+02, 1.578167266845703e+02, 1.585692919067406e+02, 1.592146751337112e+02, 1.597642828585093e+02, 1.602290638391724e+02, 1.606194305419922e+02, 1.609450690987894e+02, 1.612148434327654e+02, 1.614368593808635e+02, 1.616183467434506e+02, 1.617657012939453e+02, 1.618845522664039e+02, 1.619797972528797e+02, 1.620556183698556e+02, 1.621155851888114e+02, 1.621627044677734e+02, 1.621994782295448e+02, 1.622279967935753e+02, 1.622499847649793e+02, 1.622668151471307e+02, 1.622796173095703e+02]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_MassFraction.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_MassFraction.txt
deleted file mode 100644
index 284874a9..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_MassFraction.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-last-generated=2017-03-31
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "0",
- "number of continuous time states": "4",
- "linear": " "
-}
-senMasFra2.X=[9.999999776482582e-03, 1.564690464825852e-02, 1.810504863516514e-02, 1.917505814177894e-02, 1.964087037295471e-02, 1.984365656971931e-02, 1.993193848453071e-02, 1.997037045928084e-02, 1.998708210746525e-02, 1.999435946448136e-02, 1.999753713607788e-02, 1.999892480648313e-02, 1.999953016618772e-02, 1.999978907413436e-02, 1.999990642072547e-02, 1.999996416270733e-02, 1.999998837709205e-02, 1.999999582767487e-02, 1.999999769032001e-02, 1.999999955296516e-02, 2.000000141561031e-02, 2.000000327825546e-02, 2.000000327825546e-02, 2.000000327825546e-02, 2.000000141561031e-02, 2.000000141561031e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 2.000000141561031e-02, 2.00000014156192e-02, 2.000000327825546e-02, 2.000000514090061e-02, 2.000000327825546e-02, 2.000000141561031e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999769032001e-02, 1.999999769032001e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 2.000000141561031e-02, 2.000000141561031e-02, 2.000000141561031e-02, 2.000000141561031e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 2.000000141561031e-02, 2.000000141561031e-02, 2.000000141561031e-02, 2.000000141561031e-02, 2.000000327825546e-02, 2.000000327825546e-02, 2.000000327825546e-02, 2.000000327825546e-02, 2.000000327825546e-02, 2.00000032782377e-02, 2.000000141561031e-02, 2.000000141561031e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02]
-vol.Xi[1]=[9.999999776482582e-03, 1.564690464825852e-02, 1.810504863516514e-02, 1.917505814177894e-02, 1.964087037295471e-02, 1.984365656971931e-02, 1.993193848453071e-02, 1.997037045928084e-02, 1.998708210746525e-02, 1.999435946448136e-02, 1.999753713607788e-02, 1.999892480648313e-02, 1.999953016618772e-02, 1.999978907413436e-02, 1.999990642072547e-02, 1.999996416270733e-02, 1.999998837709205e-02, 1.999999582767487e-02, 1.999999769032001e-02, 1.999999955296516e-02, 2.000000141561031e-02, 2.000000327825546e-02, 2.000000327825546e-02, 2.000000327825546e-02, 2.000000141561031e-02, 2.000000141561031e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 2.000000141561031e-02, 2.00000014156192e-02, 2.000000327825546e-02, 2.000000514090061e-02, 2.000000327825546e-02, 2.000000141561031e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999769032001e-02, 1.999999769032001e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 2.000000141561031e-02, 2.000000141561031e-02, 2.000000141561031e-02, 2.000000141561031e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 2.000000141561031e-02, 2.000000141561031e-02, 2.000000141561031e-02, 2.000000141561031e-02, 2.000000327825546e-02, 2.000000327825546e-02, 2.000000327825546e-02, 2.000000327825546e-02, 2.000000327825546e-02, 2.00000032782377e-02, 2.000000141561031e-02, 2.000000141561031e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02]
-senMasFra1.X=[9.999999776482582e-03, 1.095162610092836e-02, 1.181269248345576e-02, 1.259181732704933e-02, 1.329679969387823e-02, 1.393469329923391e-02, 1.451188312665668e-02, 1.503414666553182e-02, 1.550670987172709e-02, 1.59343034988704e-02, 1.63212064653635e-02, 1.667128867835591e-02, 1.698805749810967e-02, 1.727468160740411e-02, 1.753403252223645e-02, 1.776870153844357e-02, 1.798104117418959e-02, 1.817317298196696e-02, 1.83470194077065e-02, 1.850432906105274e-02, 1.864667609333992e-02, 1.877548743426705e-02, 1.889203483489238e-02, 1.899749417866219e-02, 1.909291921757009e-02, 1.917925477027893e-02, 1.925737790325861e-02, 1.932806145887686e-02, 1.939201730380094e-02, 1.944988215630334e-02, 1.950223185122013e-02, 1.954958778400244e-02, 1.959242297237561e-02, 1.963117534171578e-02, 1.966624331241992e-02, 1.969798654317856e-02, 1.972669551863862e-02, 1.975267751814868e-02, 1.977619716090119e-02, 1.979747412639375e-02, 1.981673203408718e-02, 1.983416454568855e-02, 1.984993557485029e-02, 1.986420897014793e-02, 1.98771264285753e-02, 1.988881081342697e-02, 1.989938319678864e-02, 1.990895347523038e-02, 1.99176072915712e-02, 1.992543786046496e-02, 1.993252895772457e-02, 1.993894205072878e-02, 1.99447460576856e-02, 1.995000055959649e-02, 1.995475403529312e-02, 1.995905674993992e-02, 1.996295154443751e-02, 1.996647194660284e-02, 1.996965519501259e-02, 1.997253112232044e-02, 1.997512765228748e-02, 1.997747086198132e-02, 1.997958682861168e-02, 1.998152210953208e-02, 1.998328603641575e-02, 1.998489163815975e-02, 1.998635567856155e-02, 1.998769119621713e-02, 1.998890749886328e-02, 1.999002508716075e-02, 1.999104395508766e-02, 1.999196782790769e-02, 1.999279856829261e-02, 1.999353617296507e-02, 1.999417506101508e-02, 1.999478973448277e-02, 1.999535225382409e-02, 1.999585703105922e-02, 1.999630592681712e-02, 1.999669708276031e-02, 1.999702863395214e-02, 1.999733224397462e-02, 1.999760232913771e-02, 1.999784260943828e-02, 1.999805308953027e-02, 1.999824121594429e-02, 1.999840885340377e-02, 1.999855227793289e-02, 1.99986752120509e-02, 1.99987869713638e-02, 1.999888569116592e-02, 1.999898068571327e-02, 1.999907009321333e-02, 1.999914459871733e-02, 1.99992042036996e-02, 1.999925635755062e-02, 1.999930478614687e-02, 1.999934948987914e-02, 1.99993923305577e-02, 1.999943517166258e-02, 1.999947987496853e-02]
-time=[0e+00, 1e+01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_MoistAirEnthalpyFlowRate.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_MoistAirEnthalpyFlowRate.txt
deleted file mode 100644
index 325bdcd1..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_MoistAirEnthalpyFlowRate.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-last-generated=2017-04-04
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "4",
- "linear": " "
-}
-senM_flow.m_flow=[1e+00, 9.800000198682163e-01, 9.599999801317882e-01, 9.399999960263539e-01, 9.200000198682181e-01, 8.999999761581421e-01, 8.799999920527108e-01, 8.600000079472923e-01, 8.399999801317788e-01, 8.199999960263665e-01, 8.00000011920929e-01, 7.79999968210894e-01, 7.599999841054343e-01, 7.400000158945657e-01, 7.200000158946351e-01, 6.99999988079071e-01, 6.800000198681517e-01, 6.600000198681959e-01, 6.399999920527331e-01, 6.199999920527772e-01, 6.000000238418579e-01, 5.799999960262938e-01, 5.599999960263381e-01, 5.400000278155198e-01, 5.199999682109193e-01, 5e-01, 4.800000019867583e-01, 4.600000337756495e-01, 4.399999721846254e-01, 4.199999741714786e-01, 4.000000059604645e-01, 3.800000079472228e-01, 3.600000397361141e-01, 3.399999781450899e-01, 3.199999801319429e-01, 3.00000011920929e-01, 2.800000139076874e-01, 2.600000158944457e-01, 2.399999692044879e-01, 2.1999998609236e-01, 2.000000029802322e-01, 1.800000198681045e-01, 1.600000218549101e-01, 1.399999751649524e-01, 1.199999846022203e-01, 1.000000014901161e-01, 8.000001092743132e-02, 6.000002409006062e-02, 3.9999973674789e-02, 1.999998683740042e-02, 0e+00, -1.999998683740042e-02, -3.9999973674789e-02, -6.000002409006062e-02, -7.999994735038643e-02, -1.000000014901161e-01, -1.200000481792654e-01, -1.39999975164548e-01, -1.600000218553142e-01, -1.799999562909882e-01, -2.000000029802322e-01, -2.200000496694763e-01, -2.399999692040838e-01, -2.600000158948497e-01, -2.799999503305237e-01, -3.00000011920929e-01, -3.200000437090118e-01, -3.399999781446858e-01, -3.600000397365184e-01, -3.799999443700592e-01, -4.000000059604645e-01, -4.200000377485471e-01, -4.39999972184221e-01, -4.600000337760537e-01, -4.799999384099737e-01, -5e-01, -5.200000317880829e-01, -5.399999960260792e-01, -5.60000027815779e-01, -5.799999324491305e-01, -6.000000238418579e-01, -6.200000556299408e-01, -6.399999602632921e-01, -6.600000516572576e-01, -6.799999562909882e-01, -6.99999988079071e-01, -7.200000794710408e-01, -7.399999841051502e-01, -7.600000158948498e-01, -7.799999205289592e-01, -8.00000011920929e-01, -8.200000437090118e-01, -8.399999483427424e-01, -8.600000397367079e-01, -8.799999443700592e-01, -8.999999761581421e-01, -9.200000675508695e-01, -9.39999972184221e-01, -9.600000039739208e-01, -9.799999682119171e-01, -1e+00]
-time=[0e+00, 6e+01]
-senH.h_out=[4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.557394890698264e+04, 4.638313542417101e+04, 4.770001375661855e+04, 4.947859269815112e+04, 5.165834375e+04, 5.41674872649644e+04, 5.692700420119626e+04, 5.985476943036823e+04, 6.286944541804747e+04, 6.58941875e+04, 6.885961675676696e+04, 7.170620739402201e+04, 7.438580013326723e+04, 7.686213455112769e+04, 7.91109609375e+04, 8.111924692228527e+04, 8.288396662890018e+04, 8.441056426570399e+04, 8.57111687876494e+04, 8.68028359375e+04, 8.770582234536922e+04, 8.844208507923514e+04, 8.903397721726284e+04, 8.95031942312965e+04, 8.9870078125e+04, 9.015304748523826e+04, 9.036836694361549e+04, 9.053002360891455e+04, 9.064978098178524e+04, 9.073734375e+04, 9.080053138072987e+04, 9.084553120042836e+04, 9.08771640946868e+04, 9.08991171396187e+04, 9.09141484375e+04, 9.092431252016578e+04, 9.093108593024804e+04, 9.093555469187105e+04, 9.093847655624166e+04, 9.094034375e+04, 9.09415390647848e+04, 9.094229687420526e+04, 9.094275781294703e+04, 9.094304687440397e+04, 9.09432265625e+04, 9.094332812519868e+04, 9.094339843740065e+04, 9.09434375e+04, 9.094346093740065e+04, 9.094346875e+04]
-senHSen_flow.H_flow=[2.012e+04, 1.962927931550921e+04, 1.918162503466848e+04, 1.875666012314459e+04, 1.834378131510714e+04, 1.7937400390625e+04, 1.753455267055774e+04, 1.713365416966914e+04, 1.673383606450408e+04, 1.633463287592468e+04, 1.59357763671875e+04, 1.55371171241475e+04, 1.513856920925628e+04, 1.474008704072975e+04, 1.434164623106634e+04, 1.39432314453125e+04, 1.354483033141813e+04, 1.314643737335553e+04, 1.274804993133197e+04, 1.234966576234428e+04, 1.195128515625e+04, 1.155290650328072e+04, 1.115452917023364e+04, 1.075615247039136e+04, 1.035777611390989e+04, 9.959400390625e+03, 9.561025643902611e+03, 9.16264992062393e+03, 8.764272930944777e+03, 8.365897207659889e+03, 7.96752197265625e+03, 7.569145761091663e+03, 7.170769549527078e+03, 6.772392559847922e+03, 6.374016836564585e+03, 5.975640625e+03, 5.577264901716665e+03, 5.178889178433328e+03, 4.780512188754172e+03, 4.382135977191137e+03, 3.98376025390625e+03, 3.585384530622915e+03, 3.187008807338026e+03, 2.788631573521349e+03, 2.390255850237238e+03, 1.991880126953125e+03, 1.5935044036694e+03, 1.195128558315365e+03, 7.967515686373747e+02, 3.983757843186874e+02, 0e+00, -4.007104364633104e+02, -8.152609973908036e+02, -1.256677956578088e+03, -1.736409379453177e+03, -2.263717529296875e+03, -2.845209085803021e+03, -3.484601451923082e+03, -4.182705033244162e+03, -4.937570778728034e+03, -5.74486279296875e+03, -6.598308873109337e+03, -7.490276192466729e+03, -8.412368378150626e+03, -9.355951685270338e+03, -1.03127099609375e+04, -1.127501904959341e+04, -1.223626245188124e+04, -1.319103929260703e+04, -1.413519976013405e+04, -1.5065875e+04, -1.598133726481538e+04, -1.688087191117289e+04, -1.776460658078388e+04, -1.863328296178138e+04, -1.9488109375e+04, -2.033055290652914e+04, -2.116220988497195e+04, -2.19847061178752e+04, -2.279957410647233e+04, -2.3608232421875e+04, -2.441192586563831e+04, -2.521171968781292e+04, -2.600851468320097e+04, -2.680303118453573e+04, -2.7595857421875e+04, -2.838744146468605e+04, -2.91781220418324e+04, -2.996817483236044e+04, -3.0757781195463e+04, -3.1547083984375e+04, -3.233618364709494e+04, -3.31251357155949e+04, -3.391400490930577e+04, -3.470280658780159e+04, -3.5491578125e+04, -3.628032231829939e+04, -3.706904977831841e+04, -3.785777053415674e+04, -3.864647846300027e+04, -3.943519140625e+04]
-senHLat_flow.H_flow=[2.51809453125e+04, 2.4765646501743e+04, 2.430728128733594e+04, 2.382622847672598e+04, 2.333308796952502e+04, 2.283344921875e+04, 2.233027921668355e+04, 2.182515804231712e+04, 2.131895719226277e+04, 2.081214265870776e+04, 2.0304978515625e+04, 1.979761905997084e+04, 1.929014827616748e+04, 1.878261344259494e+04, 1.827503288041157e+04, 1.77674296875e+04, 1.725981282273827e+04, 1.675218538550458e+04, 1.624455484887197e+04, 1.573691959913052e+04, 1.52292822265625e+04, 1.472164192431008e+04, 1.421399983862493e+04, 1.370635758325007e+04, 1.319871452100242e+04, 1.26910712890625e+04, 1.218342903368508e+04, 1.167578580174516e+04, 1.116814095606734e+04, 1.066049870068992e+04, 1.01528564453125e+04, 9.645214189935079e+03, 9.137571934557664e+03, 8.629927088879836e+03, 8.122285321782115e+03, 7.614642578125e+03, 7.107000322747583e+03, 6.599357579092017e+03, 6.091713709970483e+03, 5.584070966314917e+03, 5.0764287109375e+03, 4.568785967280385e+03, 4.061143711901413e+03, 3.553499354503285e+03, 3.045856854986019e+03, 2.53821435546875e+03, 2.030571855951481e+03, 1.522929234363902e+03, 1.015285121104851e+03, 5.076425605523283e+02, 0e+00, -5.107679219210044e+02, -1.040063276916667e+03, -1.605323997263639e+03, -2.221875568975406e+03, -2.90211669921875e+03, -3.654892168209648e+03, -4.485178103337238e+03, -5.394059320066996e+03, -6.378926132058765e+03, -7.4339755859375e+03, -8.550809563967237e+03, -9.719212358611563e+03, -1.092794101440185e+04, -1.216544116653305e+04, -1.34205771484375e+04, -1.468314286033412e+04, -1.594428355569583e+04, -1.719676720772852e+04, -1.843503983682112e+04, -1.96552578125e+04, -2.085511239390615e+04, -2.203364499665465e+04, -2.319102489354267e+04, -2.43282471275689e+04, -2.54469296875e+04, -2.654903598294751e+04, -2.763670370174216e+04, -2.871210682800878e+04, -2.977729612844409e+04, -3.0834173828125e+04, -3.18844069591797e+04, -3.292941664219956e+04, -3.397041538369838e+04, -3.500836064425186e+04, -3.6044046875e+04, -3.707806512761063e+04, -3.811087759344602e+04, -3.914285287421122e+04, -4.017422394010466e+04, -4.120519140625e+04, -4.223588543330592e+04, -4.326638540847924e+04, -4.42967708413966e+04, -4.532707159863945e+04, -4.635732421875e+04, -4.738754558866186e+04, -4.841774087752725e+04, -4.94479309974479e+04, -5.047810284893747e+04, -5.150828125e+04]
-senH_flow.H_flow=[4.53009453125e+04, 4.439492581725182e+04, 4.348890632200365e+04, 4.258288664674635e+04, 4.167687123775716e+04, 4.07708515625e+04, 3.986483188724284e+04, 3.895881221198626e+04, 3.805279325676374e+04, 3.714677358151055e+04, 3.62407578125e+04, 3.533473813724256e+04, 3.442871846198626e+04, 3.352269950676374e+04, 3.261667911147481e+04, 3.1710662109375e+04, 3.080464315415019e+04, 2.989862275886011e+04, 2.899260575676489e+04, 2.808658536147481e+04, 2.718056640625e+04, 2.627454940415019e+04, 2.536852900886011e+04, 2.446251005364299e+04, 2.35564916114686e+04, 2.265047265625e+04, 2.17444537010314e+04, 2.083843669892538e+04, 1.993241486357461e+04, 1.902639590834981e+04, 1.812037890625e+04, 1.721435995102519e+04, 1.63083409958128e+04, 1.540232013700591e+04, 1.44963021583467e+04, 1.3590283203125e+04, 1.26842652244658e+04, 1.177824724580039e+04, 1.087222541044961e+04, 9.9662074317842e+03, 9.060189453125e+03, 8.1541704979033e+03, 7.248152519240991e+03, 6.342131172165259e+03, 5.436112705223257e+03, 4.5300947265625e+03, 3.624076259620493e+03, 2.718057792680043e+03, 1.812036689741837e+03, 9.060183448711126e+02, 0e+00, -9.114783583843148e+02, -1.855324335342626e+03, -2.862002075910487e+03, -3.95828494842703e+03, -5.16583447265625e+03, -6.500101254015774e+03, -7.969779311121247e+03, -9.576764841589304e+03, -1.131649642251176e+04, -1.3178837890625e+04, -1.514911843708278e+04, -1.72094875745189e+04, -1.934030939254626e+04, -2.152139285180339e+04, -2.3733287109375e+04, -2.595816190992753e+04, -2.818054600757086e+04, -3.038780552377304e+04, -3.257023862039266e+04, -3.47211328125e+04, -3.683645063527161e+04, -3.891451690782754e+04, -4.095563147433897e+04, -4.296153008932545e+04, -4.49350390625e+04, -4.687959084260165e+04, -4.879891553981428e+04, -5.069681489900898e+04, -5.257687023491642e+04, -5.444240625e+04, -5.629633282481802e+04, -5.814113437688749e+04, -5.997892811379919e+04, -6.181139378188775e+04, -6.363990234375e+04, -6.546550854542168e+04, -6.728900549460376e+04, -6.911102575345908e+04, -7.093200318241783e+04, -7.275228125e+04, -7.457206712730069e+04, -7.639152112407415e+04, -7.821077575072719e+04, -8.002987818649071e+04, -8.18488984375e+04, -8.366787181321126e+04, -8.54867867496205e+04, -8.730569762537947e+04, -8.912458131198741e+04, -9.094346875e+04]
-add.y=[4.53009453125e+04, 4.439492581725182e+04, 4.348890632200365e+04, 4.258288664674635e+04, 4.167687123775716e+04, 4.07708515625e+04, 3.986483188724284e+04, 3.895881221198626e+04, 3.805279325676374e+04, 3.714677358151055e+04, 3.62407578125e+04, 3.533473813724256e+04, 3.442871846198626e+04, 3.352269950676374e+04, 3.261667911147481e+04, 3.1710662109375e+04, 3.080464315415019e+04, 2.989862275886011e+04, 2.899260575676489e+04, 2.808658536147481e+04, 2.718056640625e+04, 2.627454940415019e+04, 2.536852900886011e+04, 2.446251005364299e+04, 2.35564916114686e+04, 2.265047265625e+04, 2.17444537010314e+04, 2.083843669892538e+04, 1.993241486357461e+04, 1.902639590834981e+04, 1.812037890625e+04, 1.721435995102519e+04, 1.63083409958128e+04, 1.540232013700591e+04, 1.44963021583467e+04, 1.3590283203125e+04, 1.26842652244658e+04, 1.177824724580039e+04, 1.087222541044961e+04, 9.9662074317842e+03, 9.060189453125e+03, 8.1541704979033e+03, 7.248152519240991e+03, 6.342131172165259e+03, 5.436112705223257e+03, 4.5300947265625e+03, 3.624076259620493e+03, 2.718057792680043e+03, 1.812036689741837e+03, 9.060183448711126e+02, 0e+00, -9.114783583843148e+02, -1.855324335342626e+03, -2.862002075910487e+03, -3.95828494842703e+03, -5.16583447265625e+03, -6.500101254015774e+03, -7.969779311121247e+03, -9.576764841589304e+03, -1.131649642251176e+04, -1.3178837890625e+04, -1.514911843708278e+04, -1.72094875745189e+04, -1.934030939254626e+04, -2.152139285180339e+04, -2.3733287109375e+04, -2.595816190992753e+04, -2.818054600757086e+04, -3.038780552377304e+04, -3.257023862039266e+04, -3.47211328125e+04, -3.683645063527161e+04, -3.891451690782754e+04, -4.095563147433897e+04, -4.296153008932545e+04, -4.49350390625e+04, -4.687959084260165e+04, -4.879891553981428e+04, -5.069681489900898e+04, -5.257687023491642e+04, -5.444240625e+04, -5.629633282481802e+04, -5.814113437688749e+04, -5.997892811379919e+04, -6.181139378188775e+04, -6.363990234375e+04, -6.546550854542168e+04, -6.728900549460376e+04, -6.911102575345908e+04, -7.093200318241783e+04, -7.275228125e+04, -7.457206712730069e+04, -7.639152112407415e+04, -7.821077575072719e+04, -8.002987818649071e+04, -8.18488984375e+04, -8.366787181321126e+04, -8.54867867496205e+04, -8.730569762537947e+04, -8.912458131198741e+04, -9.094346875e+04]
-pro.y=[4.53009453125e+04, 4.439492581725182e+04, 4.348890632200365e+04, 4.258288664674635e+04, 4.167687123775716e+04, 4.07708515625e+04, 3.986483188724284e+04, 3.895881221198626e+04, 3.805279325676374e+04, 3.714677358151055e+04, 3.62407578125e+04, 3.533473813724256e+04, 3.442871846198626e+04, 3.352269950676374e+04, 3.261667911147481e+04, 3.1710662109375e+04, 3.080464315415019e+04, 2.989862275886011e+04, 2.899260575676489e+04, 2.808658536147481e+04, 2.718056640625e+04, 2.627454940415019e+04, 2.536852900886011e+04, 2.446251005364299e+04, 2.35564916114686e+04, 2.265047265625e+04, 2.17444537010314e+04, 2.083843669892538e+04, 1.993241486357461e+04, 1.902639590834981e+04, 1.812037890625e+04, 1.721435995102519e+04, 1.63083409958128e+04, 1.540232013700591e+04, 1.44963021583467e+04, 1.3590283203125e+04, 1.26842652244658e+04, 1.177824724580039e+04, 1.087222541044961e+04, 9.9662074317842e+03, 9.060189453125e+03, 8.1541704979033e+03, 7.248152519240991e+03, 6.342131172165259e+03, 5.436112705223257e+03, 4.5300947265625e+03, 3.624076259620493e+03, 2.718057792680043e+03, 1.812036689741837e+03, 9.060183448711126e+02, 0e+00, -9.114783583843148e+02, -1.855324335342626e+03, -2.862002075910487e+03, -3.95828494842703e+03, -5.16583447265625e+03, -6.500101254015774e+03, -7.969779311121247e+03, -9.576764841589304e+03, -1.131649642251176e+04, -1.3178837890625e+04, -1.514911843708278e+04, -1.72094875745189e+04, -1.934030939254626e+04, -2.152139285180339e+04, -2.3733287109375e+04, -2.595816190992753e+04, -2.818054600757086e+04, -3.038780552377304e+04, -3.257023862039266e+04, -3.47211328125e+04, -3.683645063527161e+04, -3.891451690782754e+04, -4.095563147433897e+04, -4.296153008932545e+04, -4.49350390625e+04, -4.687959084260165e+04, -4.879891553981428e+04, -5.069681489900898e+04, -5.257687023491642e+04, -5.444240625e+04, -5.629633282481802e+04, -5.814113437688749e+04, -5.997892811379919e+04, -6.181139378188775e+04, -6.363990234375e+04, -6.546550854542168e+04, -6.728900549460376e+04, -6.911102575345908e+04, -7.093200318241783e+04, -7.275228125e+04, -7.457206712730069e+04, -7.639152112407415e+04, -7.821077575072719e+04, -8.002987818649071e+04, -8.18488984375e+04, -8.366787181321126e+04, -8.54867867496205e+04, -8.730569762537947e+04, -8.912458131198741e+04, -9.094346875e+04]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_PPM.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_PPM.txt
new file mode 100644
index 00000000..c3efa18c
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_PPM.txt
@@ -0,0 +1,16 @@
+last-generated=2017-04-04
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "6",
+ "linear": " "
+}
+senPPMRev.ppm=[0e+00, 8.39940707064311e-01, 3.220550920327782e+00, 6.951382136746526e+00, 1.187511207948348e+01, 1.785109392902913e+01, 2.480829065912881e+01, 3.258776653147365e+01, 4.104525534065098e+01, 5.01337628570117e+01, 5.974472418098539e+01, 6.979625255410303e+01, 8.022722884876495e+01, 9.096525330047774e+01, 1.019368258269271e+02, 1.130696226745792e+02, 1.243153574424395e+02, 1.356597783941309e+02, 1.470296702141736e+02, 1.583980434832418e+02, 1.69754736474007e+02, 1.810460528112554e+02, 1.922596642894574e+02, 2.033876198973899e+02, 2.143927813053017e+02, 2.252707824707031e+02, 2.360135599611985e+02, 2.46597212909374e+02, 2.570216154737911e+02, 2.672792342207201e+02, 2.773552325266529e+02, 2.87248685402767e+02, 2.9695554274967e+02, 3.064708527126164e+02, 3.157925473562576e+02, 3.249197530911835e+02, 3.338528315701273e+02, 3.425869404531838e+02, 3.511230203711759e+02, 3.594617121991374e+02, 3.676039605714346e+02, 3.755514476331262e+02, 3.833063073605323e+02, 3.908716525433233e+02, 3.982508112015611e+02, 4.054479313490018e+02, 4.124676829839611e+02, 4.193154066755047e+02, 4.259854915630719e+02, 4.324825988490621e+02, 4.388111572265625e+02, 4.449739742894777e+02, 4.509738882127362e+02, 4.568136227235337e+02, 4.624960928566884e+02, 4.68024418383661e+02, 4.734017731613891e+02, 4.786306696952159e+02, 4.837139266250611e+02, 4.886544220327223e+02, 4.934550245886358e+02, 4.981185236797198e+02, 5.026527993757922e+02, 5.070597554832349e+02, 5.113413146129621e+02, 5.155006648524695e+02, 5.195410741211558e+02, 5.234657605032855e+02, 5.272778367933795e+02, 5.309796833869784e+02, 5.345750234381209e+02, 5.380670034362458e+02, 5.414589137478704e+02, 5.447537169326531e+02, 5.479547699314636e+02, 5.510626831054688e+02, 5.540780667899328e+02, 5.570062310737173e+02, 5.598501056513073e+02, 5.626124981480392e+02, 5.65296073110678e+02, 5.679038638919993e+02, 5.704327971167929e+02, 5.728867790142011e+02, 5.752697158442163e+02, 5.775839879896705e+02, 5.798319147978516e+02, 5.820159376819946e+02, 5.841379931570776e+02, 5.861957345741852e+02, 5.881937834827527e+02, 5.901339709489148e+02, 5.920179449243159e+02, 5.938472923242792e+02, 5.956236000744121e+02, 5.973483330218598e+02, 5.990226987661304e+02, 6.00648371868799e+02, 6.022264984904531e+02, 6.037584214080226e+02, 6.05245361328125e+02]
+senPPMSta.ppm=[0e+00, 5.632426953471375e+01, 1.078603842622e+02, 1.550438940986048e+02, 1.982367285119529e+02, 2.377667008103322e+02, 2.738007424218035e+02, 3.067119514029935e+02, 3.368458607986383e+02, 3.643171902070146e+02, 3.893893947282826e+02, 4.122695826534328e+02, 4.331102504405183e+02, 4.520926904467314e+02, 4.694105296284386e+02, 4.852441771126711e+02, 4.997251940955804e+02, 5.129115029964131e+02, 5.249885170456693e+02, 5.360406519015015e+02, 5.461141890505734e+02, 5.553527235642291e+02, 5.638068166252306e+02, 5.715173345657743e+02, 5.785908748266976e+02, 5.8505908203125e+02, 5.909621025087753e+02, 5.963765864981433e+02, 6.013231242061744e+02, 6.05839904092192e+02, 6.0998266914572e+02, 6.137728873124407e+02, 6.172398094804065e+02, 6.204149770531386e+02, 6.233217790955944e+02, 6.259812051755639e+02, 6.284107632523171e+02, 6.306397694814731e+02, 6.326835946749133e+02, 6.345580469791424e+02, 6.36277829391066e+02, 6.378557729568245e+02, 6.393030399872387e+02, 6.406286637065821e+02, 6.418401468848895e+02, 6.429432974968087e+02, 6.439420167504761e+02, 6.448383188017792e+02, 6.456482529102462e+02, 6.463796990382299e+02, 6.470382690429688e+02, 6.47631775434358e+02, 6.481677866072793e+02, 6.486538691083879e+02, 6.490977782521616e+02, 6.494970095669248e+02, 6.498477788997657e+02, 6.501677852514383e+02, 6.504631346744336e+02, 6.50740173510585e+02, 6.51005005296569e+02, 6.512639766814563e+02, 6.514815672876437e+02, 6.516718140515726e+02, 6.518487551264099e+02, 6.520156247400076e+02, 6.521755980440267e+02, 6.523319092290667e+02, 6.524851686180713e+02, 6.526081545590017e+02, 6.527225345289311e+02, 6.528297115147608e+02, 6.529309079193646e+02, 6.530275877090183e+02, 6.531209715915035e+02, 6.532072143554688e+02, 6.5328210456029e+02, 6.53351623662048e+02, 6.534164430492079e+02, 6.534771730750783e+02, 6.535343626144665e+02, 6.53588561893558e+02, 6.536369628320297e+02, 6.536807861193278e+02, 6.537212524660473e+02, 6.537587280840959e+02, 6.537933960806882e+02, 6.538257447377538e+02, 6.538558958947161e+02, 6.538829955387245e+02, 6.53907897910899e+02, 6.53930847153805e+02, 6.539519043032778e+02, 6.539713134998455e+02, 6.539890747443809e+02, 6.540053711432262e+02, 6.540204467214647e+02, 6.540342406842394e+02, 6.54046874976717e+02, 6.540583495988977e+02, 6.5406884765625e+02]
+senPPMNoRev.ppm=[0e+00, 8.39940707064311e-01, 3.220550920327782e+00, 6.951382136746526e+00, 1.187511207948348e+01, 1.785109392902913e+01, 2.480829065912881e+01, 3.258776653147365e+01, 4.104525534065098e+01, 5.01337628570117e+01, 5.974472418098539e+01, 6.979625255410303e+01, 8.022722884876495e+01, 9.096525330047774e+01, 1.019368258269271e+02, 1.130696226745792e+02, 1.243153574424395e+02, 1.356597783941309e+02, 1.470296702141736e+02, 1.583980434832418e+02, 1.69754736474007e+02, 1.810460528112554e+02, 1.922596642894574e+02, 2.033876198973899e+02, 2.143927813053017e+02, 2.252707824707031e+02, 2.360135599611985e+02, 2.46597212909374e+02, 2.570216154737911e+02, 2.672792342207201e+02, 2.773552325266529e+02, 2.87248685402767e+02, 2.9695554274967e+02, 3.064708527126164e+02, 3.157925473562576e+02, 3.249197530911835e+02, 3.338528315701273e+02, 3.425869404531838e+02, 3.511230203711759e+02, 3.594617121991374e+02, 3.676039605714346e+02, 3.755514476331262e+02, 3.833063073605323e+02, 3.908716525433233e+02, 3.982508112015611e+02, 4.054479313490018e+02, 4.124676829839611e+02, 4.193154066755047e+02, 4.259854915630719e+02, 4.324825988490621e+02, 4.388111572265625e+02, 4.449739742894777e+02, 4.509738882127362e+02, 4.568136227235337e+02, 4.624960928566884e+02, 4.68024418383661e+02, 4.734017731613891e+02, 4.786306696952159e+02, 4.837139266250611e+02, 4.886544220327223e+02, 4.934550245886358e+02, 4.981185236797198e+02, 5.026527993757922e+02, 5.070597554832349e+02, 5.113413146129621e+02, 5.155006648524695e+02, 5.195410741211558e+02, 5.234657605032855e+02, 5.272778367933795e+02, 5.309796833869784e+02, 5.345750234381209e+02, 5.380670034362458e+02, 5.414589137478704e+02, 5.447537169326531e+02, 5.479547699314636e+02, 5.510626831054688e+02, 5.540780667899328e+02, 5.570062310737173e+02, 5.598501056513073e+02, 5.626124981480392e+02, 5.65296073110678e+02, 5.679038638919993e+02, 5.704327971167929e+02, 5.728867790142011e+02, 5.752697158442163e+02, 5.775839879896705e+02, 5.798319147978516e+02, 5.820159376819946e+02, 5.841379931570776e+02, 5.861957345741852e+02, 5.881937834827527e+02, 5.901339709489148e+02, 5.920179449243159e+02, 5.938472923242792e+02, 5.956236000744121e+02, 5.973483330218598e+02, 5.990226987661304e+02, 6.00648371868799e+02, 6.022264984904531e+02, 6.037584214080226e+02, 6.05245361328125e+02]
+senPPMTwoPort.ppm=[0e+00, 8.39940707064311e-01, 3.220550920327782e+00, 6.951382136746526e+00, 1.187511207948348e+01, 1.785109392902913e+01, 2.480829065912881e+01, 3.258776653147365e+01, 4.104525534065098e+01, 5.01337628570117e+01, 5.974472418098539e+01, 6.979625255410303e+01, 8.022722884876495e+01, 9.096525330047774e+01, 1.019368258269271e+02, 1.130696226745792e+02, 1.243153574424395e+02, 1.356597783941309e+02, 1.470296702141736e+02, 1.583980434832418e+02, 1.69754736474007e+02, 1.810460528112554e+02, 1.922596642894574e+02, 2.033876198973899e+02, 2.143927813053017e+02, 2.252707824707031e+02, 2.360135599611985e+02, 2.46597212909374e+02, 2.570216154737911e+02, 2.672792342207201e+02, 2.773552325266529e+02, 2.87248685402767e+02, 2.9695554274967e+02, 3.064708527126164e+02, 3.157925473562576e+02, 3.249197530911835e+02, 3.338528315701273e+02, 3.425869404531838e+02, 3.511230203711759e+02, 3.594617121991374e+02, 3.676039605714346e+02, 3.755514476331262e+02, 3.833063073605323e+02, 3.908716525433233e+02, 3.982508112015611e+02, 4.054479313490018e+02, 4.124676829839611e+02, 4.193154066755047e+02, 4.259854915630719e+02, 4.324825988490621e+02, 4.388111572265625e+02, 4.449739742894777e+02, 4.509738882127362e+02, 4.568136227235337e+02, 4.624960928566884e+02, 4.68024418383661e+02, 4.734017731613891e+02, 4.786306696952159e+02, 4.837139266250611e+02, 4.886544220327223e+02, 4.934550245886358e+02, 4.981185236797198e+02, 5.026527993757922e+02, 5.070597554832349e+02, 5.113413146129621e+02, 5.155006648524695e+02, 5.195410741211558e+02, 5.234657605032855e+02, 5.272778367933795e+02, 5.309796833869784e+02, 5.345750234381209e+02, 5.380670034362458e+02, 5.414589137478704e+02, 5.447537169326531e+02, 5.479547699314636e+02, 5.510626831054688e+02, 5.540780667899328e+02, 5.570062310737173e+02, 5.598501056513073e+02, 5.626124981480392e+02, 5.65296073110678e+02, 5.679038638919993e+02, 5.704327971167929e+02, 5.728867790142011e+02, 5.752697158442163e+02, 5.775839879896705e+02, 5.798319147978516e+02, 5.820159376819946e+02, 5.841379931570776e+02, 5.861957345741852e+02, 5.881937834827527e+02, 5.901339709489148e+02, 5.920179449243159e+02, 5.938472923242792e+02, 5.956236000744121e+02, 5.973483330218598e+02, 5.990226987661304e+02, 6.00648371868799e+02, 6.022264984904531e+02, 6.037584214080226e+02, 6.05245361328125e+02]
+senPPMVol2.ppm=[6.541798095703125e+02, 6.541798095703125e+02]
+senPPMVol.ppm=[0e+00, 5.632426953471375e+01, 1.078603842622e+02, 1.550438940986048e+02, 1.982367285119529e+02, 2.377667008103322e+02, 2.738007424218035e+02, 3.067119514029935e+02, 3.368458607986383e+02, 3.643171902070146e+02, 3.893893947282826e+02, 4.122695826534328e+02, 4.331102504405183e+02, 4.520926904467314e+02, 4.694105296284386e+02, 4.852441771126711e+02, 4.997251940955804e+02, 5.129115029964131e+02, 5.249885170456693e+02, 5.360406519015015e+02, 5.461141890505734e+02, 5.553527235642291e+02, 5.638068166252306e+02, 5.715173345657743e+02, 5.785908748266976e+02, 5.8505908203125e+02, 5.909621025087753e+02, 5.963765864981433e+02, 6.013231242061744e+02, 6.05839904092192e+02, 6.0998266914572e+02, 6.137728873124407e+02, 6.172398094804065e+02, 6.204149770531386e+02, 6.233217790955944e+02, 6.259812051755639e+02, 6.284107632523171e+02, 6.306397694814731e+02, 6.326835946749133e+02, 6.345580469791424e+02, 6.36277829391066e+02, 6.378557729568245e+02, 6.393030399872387e+02, 6.406286637065821e+02, 6.418401468848895e+02, 6.429432974968087e+02, 6.439420167504761e+02, 6.448383188017792e+02, 6.456482529102462e+02, 6.463796990382299e+02, 6.470382690429688e+02, 6.47631775434358e+02, 6.481677866072793e+02, 6.486538691083879e+02, 6.490977782521616e+02, 6.494970095669248e+02, 6.498477788997657e+02, 6.501677852514383e+02, 6.504631346744336e+02, 6.50740173510585e+02, 6.51005005296569e+02, 6.512639766814563e+02, 6.514815672876437e+02, 6.516718140515726e+02, 6.518487551264099e+02, 6.520156247400076e+02, 6.521755980440267e+02, 6.523319092290667e+02, 6.524851686180713e+02, 6.526081545590017e+02, 6.527225345289311e+02, 6.528297115147608e+02, 6.529309079193646e+02, 6.530275877090183e+02, 6.531209715915035e+02, 6.532072143554688e+02, 6.5328210456029e+02, 6.53351623662048e+02, 6.534164430492079e+02, 6.534771730750783e+02, 6.535343626144665e+02, 6.53588561893558e+02, 6.536369628320297e+02, 6.536807861193278e+02, 6.537212524660473e+02, 6.537587280840959e+02, 6.537933960806882e+02, 6.538257447377538e+02, 6.538558958947161e+02, 6.538829955387245e+02, 6.53907897910899e+02, 6.53930847153805e+02, 6.539519043032778e+02, 6.539713134998455e+02, 6.539890747443809e+02, 6.540053711432262e+02, 6.540204467214647e+02, 6.540342406842394e+02, 6.54046874976717e+02, 6.540583495988977e+02, 6.5406884765625e+02]
+time=[0e+00, 3e+00]
+senPPMIn.ppm=[0e+00, 0e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_Pressure.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_Pressure.txt
deleted file mode 100644
index 4ba46b1f..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_Pressure.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-last-generated=2017-05-01
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-dp.port_a.m_flow=[1e+01, 9.800000186264519e+00, 9.60000037252904e+00, 9.399999605119255e+00, 9.199999791383764e+00, 9.000000014901145e+00, 8.800000163912802e+00, 8.600000387430196e+00, 8.399999582767594e+00, 8.199999880790497e+00, 8.000000029802234e+00, 7.80000017881397e+00, 7.599999850988548e+00, 7.400000000000284e+00, 7.199999821186029e+00, 7.000000119208934e+00, 6.800000119209503e+00, 6.599999940395248e+00, 6.400000238418153e+00, 6.199999761581563e+00, 6.000000059604467e+00, 5.800000059605035e+00, 5.599999880790781e+00, 5.400000178813685e+00, 5.199999701977096e+00, 5e+00, 4.800000000000568e+00, 4.60000011920865e+00, 4.400000119209218e+00, 4.199999642372629e+00, 4.000000238417869e+00, 3.799999999999858e+00, 3.599999761581847e+00, 3.400000357627087e+00, 3.200000119209076e+00, 2.999999880791066e+00, 2.800000238417727e+00, 2.600000000000284e+00, 2.399999999999716e+00, 2.199999761582273e+00, 2.000000119208934e+00, 1.799999880790924e+00, 1.599999761581421e+00, 1.40000011920929e+00, 1.2e+00, 9.999997615817759e-01, 8.000001788134365e-01, 6.000000000000361e-01, 3.999997913842233e-01, 2.000001937146694e-01, 0e+00, -2.000001937118273e-01, -4.000003874236545e-01, -6.000005960362167e-01, -7.999995827745215e-01, -9.999997615853297e-01, -1.199999999999291e+00, -1.400000119207157e+00, -1.600000357621899e+00, -1.800000476829342e+00, -1.999999523171368e+00, -2.199999761586537e+00, -2.400000000001137e+00, -2.599999999998863e+00, -2.800000238413463e+00, -3.000000476828632e+00, -3.199999523172222e+00, -3.399999761585401e+00, -3.59999976158398e+00, -3.800000000000567e+00, -4.000000238414315e+00, -4.200000238410905e+00, -4.399999523173073e+00, -4.599999523169663e+00, -4.80000000000341e+00, -5e+00, -5.19999999999659e+00, -5.400000476830337e+00, -5.600000476826927e+00, -5.799999761589095e+00, -5.999999761585685e+00, -6.199999761580854e+00, -6.400000238416021e+00, -6.60000023841261e+00, -6.800000715246358e+00, -6.999999523171367e+00, -7.199999523167957e+00, -7.400000000001705e+00, -7.599999999998295e+00, -7.800000476832043e+00, -8.000000476828632e+00, -8.199999284753643e+00, -8.399999284750232e+00, -8.600000238421138e+00, -8.800000238419146e+00, -9.000000238414316e+00, -9.200000238410905e+00, -9.399999046335914e+00, -9.600000000006821e+00, -9.80000000000341e+00, -1e+01]
-time=[0e+00, 1e+00]
-senRelPre.p_rel=[2e+02, 1.920800016561742e+02, 1.843200069816099e+02, 1.767200007175183e+02, 1.692799981226941e+02, 1.620000005376363e+02, 1.548800039408206e+02, 1.479199983744619e+02, 1.411199939184304e+02, 1.344799980792966e+02, 1.280000009560589e+02, 1.216799999341982e+02, 1.155199950165794e+02, 1.095199938278404e+02, 1.036800006494506e+02, 9.800000334738847e+01, 9.248000141716267e+01, 8.712000369357554e+01, 8.192000184248701e+01, 7.687999607467884e+01, 7.200000143528204e+01, 6.727999574758202e+01, 6.272000068855431e+01, 5.832000150393852e+01, 5.407999960804383e+01, 5e+01, 4.60799981842066e+01, 4.232000366019716e+01, 3.872000164222577e+01, 3.527999598885001e+01, 3.200000383376251e+01, 2.88799998893727e+01, 2.59199980278068e+01, 2.312000442694398e+01, 2.048000046348324e+01, 1.799999857908794e+01, 1.568245065231243e+01, 1.353787330294226e+01, 1.157471949947964e+01, 9.796809673405106e+00, 8.20370478627863e+00, 6.791039476067097e+00, 5.55090802269043e+00, 4.472202074978331e+00, 3.540959870863629e+00, 2.740739906298358e+00, 2.052966419812646e+00, 1.457279974233038e+00, 9.319046809096749e-01, 4.539974887723425e-01, 0e+00, -4.539974887657411e-01, -9.319061687702119e-01, -1.457281653344553e+00, -2.05296452950046e+00, -2.740739906311322e+00, -3.540959870860615e+00, -4.472202074967483e+00, -5.550911477764923e+00, -6.791043463548234e+00, -8.203700342662923e+00, -9.796809673440631e+00, -1.15747194994928e+01, -1.353787330292753e+01, -1.568245065226446e+01, -1.800000576009624e+01, -2.047999287046212e+01, -2.311999632652214e+01, -2.591999802783734e+01, -2.887999988938354e+01, -3.200000383370537e+01, -3.528000602329953e+01, -3.871999119582195e+01, -4.23199927064216e+01, -4.607999818426094e+01, -5e+01, -5.408000581351906e+01, -5.832000796493784e+01, -6.272001408365086e+01, -6.727998885746882e+01, -7.199999429711004e+01, -7.687999607466131e+01, -8.192000184243224e+01, -8.712001158505652e+01, -9.248001766554414e+01, -9.799998668695095e+01, -1.036799920884304e+02, -1.095199938278823e+02, -1.155199995498168e+02, -1.216800092542885e+02, -1.280000152967144e+02, -1.3447997856561e+02, -1.41119983928955e+02, -1.479199932595033e+02, -1.548800065651083e+02, -1.620000086020372e+02, -1.692800146062558e+02, -1.767199797518256e+02, -1.843199927064853e+02, -1.920799943696137e+02, -2e+02]
-senPre_b.p=[1.01325e+05, 1.01325e+05]
-senPre_a.p=[1.01525e+05, 1.015170781248254e+05, 1.015093203121577e+05, 1.015017187494971e+05, 1.014942812493434e+05, 1.014870000005384e+05, 1.01479882811557e+05, 1.014729218752049e+05, 1.014661171863056e+05, 1.014594765648609e+05, 1.014530000009546e+05, 1.014466796871298e+05, 1.014405234358655e+05, 1.014345234346688e+05, 1.014286796878446e+05, 1.014230000033528e+05, 1.014174765605722e+05, 1.014121171884499e+05, 1.014069218786601e+05, 1.014018828113172e+05, 1.013970000014319e+05, 1.013922812469522e+05, 1.013877187494691e+05, 1.013833203143091e+05, 1.013790781227788e+05, 1.01375e+05, 1.013710781213492e+05, 1.013673203164814e+05, 1.013637187504238e+05, 1.013602812471967e+05, 1.013570000038184e+05, 1.013538828132264e+05, 1.013509218729325e+05, 1.013481171910856e+05, 1.01345476563422e+05, 1.013429999985797e+05, 1.01340679690741e+05, 1.013385390634872e+05, 1.013365781241059e+05, 1.013347968725972e+05, 1.01333203125908e+05, 1.01331789062039e+05, 1.013305546859633e+05, 1.013294687507264e+05, 1.013285390622951e+05, 1.013277421866152e+05, 1.013270546880215e+05, 1.013264609374302e+05, 1.013259296869971e+05, 1.01325453125447e+05, 1.01325e+05, 1.01324546874553e+05, 1.013240703115314e+05, 1.013235390609354e+05, 1.013229453138411e+05, 1.013222578133847e+05, 1.013214609377049e+05, 1.013205312492736e+05, 1.013194453105443e+05, 1.013182109339145e+05, 1.01316796878539e+05, 1.013152031274028e+05, 1.013134218758941e+05, 1.013114609365128e+05, 1.013093203092591e+05, 1.013069999942259e+05, 1.013045234441588e+05, 1.013018828169982e+05, 1.012990781270675e+05, 1.012961171867736e+05, 1.012929999961816e+05, 1.012897187427917e+05, 1.012862812600581e+05, 1.012826796945034e+05, 1.012789218786507e+05, 1.01275e+05, 1.01270921871014e+05, 1.0126667967923e+05, 1.01262281237148e+05, 1.012577187599743e+05, 1.01253000005681e+05, 1.012481171886828e+05, 1.0124307812134e+05, 1.01237882803634e+05, 1.012325234231579e+05, 1.012270000133177e+05, 1.012213203207141e+05, 1.012154765653312e+05, 1.012094765595943e+05, 1.012033203035594e+05, 1.011969999847266e+05, 1.011905234546081e+05, 1.011838828236477e+05, 1.011770781299173e+05, 1.011701171858236e+05, 1.011629999913854e+05, 1.011557187341585e+05, 1.011482812714573e+05, 1.011406797021029e+05, 1.011329218824504e+05, 1.01125e+05]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_RelativeHumidity.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_RelativeHumidity.txt
deleted file mode 100644
index 70edf712..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_RelativeHumidity.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-last-generated=2017-03-31
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "1",
- "linear": " "
-}
-relHum.port_a.m_flow=[1e+00, 9.760000109672546e-01, 9.520000219345093e-01, 9.279999732971191e-01, 9.039999842643738e-01, 8.799999952316284e-01, 8.560000061988831e-01, 8.320000171661377e-01, 8.080000281333923e-01, 7.839999794960022e-01, 7.599999904632568e-01, 7.360000014305115e-01, 7.120000123977661e-01, 6.880000233650208e-01, 6.639999747276305e-01, 6.399999856948853e-01, 6.159999966621399e-01, 5.920000076293944e-01, 5.680000185966492e-01, 5.440000295639038e-01, 5.199999809265137e-01, 4.959999918937683e-01, 4.720000028610229e-01, 4.480000138282776e-01, 4.239999949932098e-01, 4.000000059604645e-01, 3.759999871253967e-01, 3.519999980926514e-01, 3.280000090599059e-01, 3.039999902248383e-01, 2.800000011920929e-01, 2.560000121593475e-01, 2.319999933242798e-01, 2.080000042915344e-01, 1.840000003576278e-01, 1.599999964237213e-01, 1.36000007390976e-01, 1.120000034570694e-01, 8.799999952316284e-02, 6.400000303983688e-02, 3.999999910593033e-02, 1.600000075995934e-02, -8.00000037997961e-03, -3.200000151991844e-02, -5.60000017285347e-02, -7.999999821186066e-02, -1.040000021457672e-01, -1.280000060796738e-01, -1.519999951124191e-01, -1.759999990463257e-01, -2.000000029802322e-01, -2.240000069141388e-01, -2.479999959468842e-01, -2.720000147819519e-01, -2.960000038146973e-01, -3.199999928474426e-01, -3.440000116825106e-01, -3.680000007152555e-01, -3.919999897480011e-01, -4.160000085830688e-01, -4.399999976158142e-01, -4.639999866485596e-01, -4.880000054836273e-01, -5.120000243186951e-01, -5.360000133514404e-01, -5.600000023841858e-01, -5.839999914169312e-01, -6.079999804496765e-01, -6.320000290870669e-01, -6.560000181198118e-01, -6.800000071525574e-01, -7.039999961853027e-01, -7.279999852180481e-01, -7.519999742507935e-01, -7.760000228881836e-01, -8.00000011920929e-01, -8.240000009536743e-01, -8.479999899864197e-01, -8.71999979019165e-01, -8.960000276565552e-01, -9.200000166893005e-01, -9.440000057220461e-01, -9.67999994754791e-01, -9.919999837875366e-01, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00]
-time=[0e+00, 6e+02]
-relHum.phi=[5e-01, 4.945496916770935e-01, 4.804216623306274e-01, 4.670111536979675e-01, 4.540262222290039e-01, 4.414515197277069e-01, 4.292728006839752e-01, 4.174764752388e-01, 4.060494303703308e-01, 3.949791491031647e-01, 3.842535316944122e-01, 3.738609850406647e-01, 3.637903928756714e-01, 3.540311455726624e-01, 3.445729315280914e-01, 3.354057967662811e-01, 3.265204727649689e-01, 3.179078996181488e-01, 3.095594644546509e-01, 3.014668822288513e-01, 2.936223447322845e-01, 2.91264146566391e-01, 2.911533415317535e-01, 2.911471724510193e-01, 2.911470234394073e-01, 2.911470532417297e-01, 2.911470234394073e-01, 2.911470234394073e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.943493127822876e-01, 3.393118977546692e-01, 4.211523532867432e-01, 5.11900782585144e-01, 5.883105993270874e-01, 6.40316903591156e-01, 6.697044372558594e-01, 6.83684766292572e-01, 6.893284916877747e-01, 6.912717223167419e-01, 6.918445229530334e-01, 6.919894814491272e-01, 6.920210719108582e-01, 6.920270323753357e-01, 6.920279860496521e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01, 6.920281648635864e-01]
-senRelHum.phi=[6.643086671829224e-01, 4.918669462203979e-01, 4.780350029468536e-01, 4.646413028240204e-01, 4.516705274581909e-01, 4.391078948974609e-01, 4.269391894340515e-01, 4.151507616043091e-01, 4.037294983863831e-01, 3.926627039909363e-01, 3.81938248872757e-01, 3.715443909168243e-01, 3.614698648452759e-01, 3.517037928104401e-01, 3.422357439994812e-01, 3.330556154251099e-01, 3.241537511348724e-01, 3.155207931995392e-01, 3.07147741317749e-01, 2.990259230136871e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01, 2.91146993637085e-01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_SpecificEnthalpy.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_SpecificEnthalpy.txt
deleted file mode 100644
index 8664cff5..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_SpecificEnthalpy.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-last-generated=2017-03-31
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "1",
- "linear": " "
-}
-senStr.port_a.m_flow=[1e+00, 9.800000198682163e-01, 9.599999801317882e-01, 9.399999960263539e-01, 9.200000198682181e-01, 8.999999761581421e-01, 8.799999920527108e-01, 8.600000079472923e-01, 8.399999801317788e-01, 8.199999960263665e-01, 8.00000011920929e-01, 7.79999968210894e-01, 7.599999841054343e-01, 7.400000158945657e-01, 7.200000158946351e-01, 6.99999988079071e-01, 6.800000198681517e-01, 6.600000198681959e-01, 6.399999920527331e-01, 6.199999920527772e-01, 6.000000238418579e-01, 5.799999960262938e-01, 5.599999960263381e-01, 5.400000278155198e-01, 5.199999682109193e-01, 5e-01, 4.800000019867583e-01, 4.600000337756495e-01, 4.399999721846254e-01, 4.199999741714786e-01, 4.000000059604645e-01, 3.800000079472228e-01, 3.600000397361141e-01, 3.399999781450899e-01, 3.199999801319429e-01, 3.00000011920929e-01, 2.800000139076874e-01, 2.600000158944457e-01, 2.399999692044879e-01, 2.1999998609236e-01, 2.000000029802322e-01, 1.800000198681045e-01, 1.600000218549101e-01, 1.399999751649524e-01, 1.199999846022203e-01, 1.000000014901161e-01, 8.000001092743132e-02, 6.000002409006062e-02, 3.9999973674789e-02, 1.999998683740042e-02, 0e+00, -1.999998683740042e-02, -3.9999973674789e-02, -6.000002409006062e-02, -7.999994735038643e-02, -1.000000014901161e-01, -1.200000481792654e-01, -1.39999975164548e-01, -1.600000218553142e-01, -1.799999562909882e-01, -2.000000029802322e-01, -2.200000496694763e-01, -2.399999692040838e-01, -2.600000158948497e-01, -2.799999503305237e-01, -3.00000011920929e-01, -3.200000437090118e-01, -3.399999781446858e-01, -3.600000397365184e-01, -3.799999443700592e-01, -4.000000059604645e-01, -4.200000377485471e-01, -4.39999972184221e-01, -4.600000337760537e-01, -4.799999384099737e-01, -5e-01, -5.200000317880829e-01, -5.399999960260792e-01, -5.60000027815779e-01, -5.799999324491305e-01, -6.000000238418579e-01, -6.200000556299408e-01, -6.399999602632921e-01, -6.600000516572576e-01, -6.799999562909882e-01, -6.99999988079071e-01, -7.200000794710408e-01, -7.399999841051502e-01, -7.600000158948498e-01, -7.799999205289592e-01, -8.00000011920929e-01, -8.200000437090118e-01, -8.399999483427424e-01, -8.600000397367079e-01, -8.799999443700592e-01, -8.999999761581421e-01, -9.200000675508695e-01, -9.39999972184221e-01, -9.600000039739208e-01, -9.799999682119171e-01, -1e+00]
-time=[0e+00, 6e+01]
-senStr.h_out=[4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.530076953125e+04, 4.51649962487955e+04, 4.476054752426389e+04, 4.40944677095337e+04, 4.317855335556535e+04, 4.20288515625e+04, 4.066517201193854e+04, 3.91105176914121e+04, 3.739041957674862e+04, 3.553231344217886e+04, 3.356471484375e+04, 3.151658845084616e+04, 2.941661987556922e+04, 2.729252463930178e+04, 2.517056787894773e+04, 2.307495703125e+04, 2.102753395134485e+04, 1.90474341190206e+04, 1.715086484735113e+04, 1.535108552643605e+04, 1.36583095703125e+04, 1.207985944728141e+04, 1.062030648213112e+04, 9.281653663576228e+03, 8.063652878143082e+03, 6.9640341796875e+03, 5.978879011338032e+03, 5.102905357071008e+03, 4.329761298474525e+03, 3.652361493139159e+03, 3.063116943359375e+03, 2.554209268803716e+03, 2.11778518842438e+03, 1.746128600954311e+03, 1.431822034403076e+03, 1.16783740234375e+03, 9.476304813877576e+02, 7.651860665552932e+02, 6.150425555351825e+02, 4.923088807374679e+02, 3.926471862792969e+02, 3.122562603746958e+02, 2.478372481578506e+02, 1.965546766955915e+02, 1.55996812899474e+02, 1.24129035949707e+02, 9.925183022757577e+01, 7.995727457158753e+01, 6.50887442979802e+01, 5.370461955914793e+01, 4.504401397705078e+01]
-senFloSou.h_out=[4.53009453125e+04, 4.53009453125e+04]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_SpecificEntropy.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_SpecificEntropy.txt
deleted file mode 100644
index ca4854e9..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_SpecificEntropy.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-last-generated=2017-03-31
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "1",
- "linear": " "
-}
-senStr.port_a.m_flow=[1e+00, 9.800000198682163e-01, 9.599999801317882e-01, 9.399999960263539e-01, 9.200000198682181e-01, 8.999999761581421e-01, 8.799999920527108e-01, 8.600000079472923e-01, 8.399999801317788e-01, 8.199999960263665e-01, 8.00000011920929e-01, 7.79999968210894e-01, 7.599999841054343e-01, 7.400000158945657e-01, 7.200000158946351e-01, 6.99999988079071e-01, 6.800000198681517e-01, 6.600000198681959e-01, 6.399999920527331e-01, 6.199999920527772e-01, 6.000000238418579e-01, 5.799999960262938e-01, 5.599999960263381e-01, 5.400000278155198e-01, 5.199999682109193e-01, 5e-01, 4.800000019867583e-01, 4.600000337756495e-01, 4.399999721846254e-01, 4.199999741714786e-01, 4.000000059604645e-01, 3.800000079472228e-01, 3.600000397361141e-01, 3.399999781450899e-01, 3.199999801319429e-01, 3.00000011920929e-01, 2.800000139076874e-01, 2.600000158944457e-01, 2.399999692044879e-01, 2.1999998609236e-01, 2.000000029802322e-01, 1.800000198681045e-01, 1.600000218549101e-01, 1.399999751649524e-01, 1.199999846022203e-01, 1.000000014901161e-01, 8.000001092743132e-02, 6.000002409006062e-02, 3.9999973674789e-02, 1.999998683740042e-02, 0e+00, -1.999998683740042e-02, -3.9999973674789e-02, -6.000002409006062e-02, -7.999994735038643e-02, -1.000000014901161e-01, -1.200000481792654e-01, -1.39999975164548e-01, -1.600000218553142e-01, -1.799999562909882e-01, -2.000000029802322e-01, -2.200000496694763e-01, -2.399999692040838e-01, -2.600000158948497e-01, -2.799999503305237e-01, -3.00000011920929e-01, -3.200000437090118e-01, -3.399999781446858e-01, -3.600000397365184e-01, -3.799999443700592e-01, -4.000000059604645e-01, -4.200000377485471e-01, -4.39999972184221e-01, -4.600000337760537e-01, -4.799999384099737e-01, -5e-01, -5.200000317880829e-01, -5.399999960260792e-01, -5.60000027815779e-01, -5.799999324491305e-01, -6.000000238418579e-01, -6.200000556299408e-01, -6.399999602632921e-01, -6.600000516572576e-01, -6.799999562909882e-01, -6.99999988079071e-01, -7.200000794710408e-01, -7.399999841051502e-01, -7.600000158948498e-01, -7.799999205289592e-01, -8.00000011920929e-01, -8.200000437090118e-01, -8.399999483427424e-01, -8.600000397367079e-01, -8.799999443700592e-01, -8.999999761581421e-01, -9.200000675508695e-01, -9.39999972184221e-01, -9.600000039739208e-01, -9.799999682119171e-01, -1e+00]
-time=[0e+00, 6e+01]
-senFloSou.s=[9.535915374755859e+01, 9.535915374755859e+01]
-senStr.s=[9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535850524902344e+01, 9.485599575204917e+01, 9.335924007359685e+01, 9.089425274129002e+01, 8.75047244925471e+01, 8.325003814697266e+01, 7.820347726179082e+01, 7.245019533020503e+01, 6.608469303294939e+01, 5.920844537168809e+01, 5.192698287963867e+01, 4.434749549566443e+01, 3.657615130517538e+01, 2.871552038713292e+01, 2.086279570849766e+01, 1.310756301879883e+01, 5.530661741540816e+00, -1.797077901542768e+00, -8.815692025020454e+00, -1.54761139369661e+01, -2.174055862426758e+01, -2.758189285033848e+01, -3.298320869069627e+01, -3.793712830255355e+01, -4.244455762158983e+01, -4.651388931274414e+01, -5.015963083835089e+01, -5.340132893177508e+01, -5.62624888664246e+01, -5.876933066885717e+01, -6.094993591308594e+01, -6.283324106272091e+01, -6.444830892599063e+01, -6.582369390329356e+01, -6.69868365362297e+01, -6.796376037597656e+01, -6.877868074451916e+01, -6.945384899866643e+01, -7.000948396309175e+01, -7.046367539066225e+01, -7.083249664306641e+01, -7.112999791522392e+01, -7.136838503854958e+01, -7.155816671331017e+01, -7.17082592363859e+01, -7.182619476318359e+01, -7.191825886770701e+01, -7.198965445937866e+01, -7.204467016449833e+01, -7.208679189634108e+01, -7.211884307861328e+01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_TemperatureDryBulb.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_TemperatureDryBulb.txt
deleted file mode 100644
index 1ed78864..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_TemperatureDryBulb.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-last-generated=2017-04-04
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "2",
- "linear": " "
-}
-temSteSta.T=[2.981499938964844e+02, 3.011499937772739e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02]
-temDynLoss.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.982846651083485e+02, 3.020130878863759e+02, 3.047207669899989e+02, 3.066868601583144e+02, 3.08114501953125e+02, 3.091510614342058e+02, 3.099038077549835e+02, 3.104504705421043e+02, 3.108474123167869e+02, 3.111356506347656e+02, 3.113449705865165e+02, 3.114969480728044e+02, 3.113733821059998e+02, 3.110125424978921e+02, 3.106588134765625e+02, 3.103120119374153e+02, 3.099720768448091e+02, 3.096388850795367e+02, 3.093122861717725e+02, 3.089921569824219e+02, 3.086783754420453e+02, 3.083707889622671e+02, 3.080693355587648e+02, 3.077738645605097e+02, 3.074842834472656e+02, 3.035588400771805e+02, 3.007085908222721e+02, 2.986386086764741e+02, 2.971355013964552e+02, 2.960440368652344e+02, 2.952515242227421e+02, 2.946761481020036e+02, 2.942583003444946e+02, 2.939548041431544e+02, 2.937344360351562e+02, 2.935744320385545e+02, 2.93458191047579e+02, 2.933738097261707e+02, 2.93312530654169e+02, 2.932680358886719e+02, 2.932357177059181e+02, 2.93212249781859e+02, 2.93195190411837e+02, 2.931828308380979e+02, 2.93173828125e+02, 2.931673278672779e+02, 2.931625976614887e+02, 2.931591796840075e+02, 2.931566772519144e+02, 2.931548767089844e+02, 2.98288188219601e+02, 3.020156513640365e+02, 3.047226285615334e+02, 3.066882280416548e+02, 3.08115478515625e+02, 3.091517660820671e+02, 3.099043265539923e+02, 3.10450867270241e+02, 3.1084768588323e+02, 3.111358337402344e+02, 3.113451237283392e+02, 3.114970701431142e+02, 3.116073914728681e+02, 3.116875303390787e+02, 3.117456970214844e+02, 3.117879639552731e+02, 3.118186339990543e+02, 3.118409118885177e+02, 3.118570556279746e+02, 3.118687438964844e+02, 3.118772583186312e+02, 3.118834533623497e+02, 3.118879699755538e+02, 3.118912658617678e+02, 3.118936462402344e+02]
-temDyn.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.983335847341814e+02, 3.021736101866614e+02, 3.050185882159453e+02, 3.071261607831227e+02, 3.086874389648438e+02, 3.098439629732599e+02, 3.107008047011205e+02, 3.113356024783523e+02, 3.118058474167078e+02, 3.121542053222656e+02, 3.124122923354357e+02, 3.126034848926371e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.076178922480123e+02, 3.038683208640137e+02, 3.010902985736235e+02, 2.99032261705153e+02, 2.975076293945312e+02, 2.963782629905195e+02, 2.955416879517808e+02, 2.949219048615719e+02, 2.944626780337573e+02, 2.941224670410156e+02, 2.938704523476894e+02, 2.936837465476341e+02, 2.935454100099535e+02, 2.934429323594033e+02, 2.933670349121094e+02, 2.93310790896496e+02, 2.932691040508608e+02, 2.932382506996313e+02, 2.932153626004377e+02, 2.931984252929688e+02, 2.931859130595506e+02, 2.93176635752665e+02, 2.931697692797363e+02, 2.931646728628157e+02, 2.93160888671875e+02, 2.983416857692077e+02, 3.021795916340396e+02, 3.050230132630751e+02, 3.071294508322915e+02, 3.086898803710938e+02, 3.098457666067623e+02, 3.107021169575467e+02, 3.11336579040669e+02, 3.118065785335929e+02, 3.121547546386719e+02, 3.124126897549597e+02, 3.126037900684149e+02, 3.127453614779141e+02, 3.128502194910209e+02, 3.129279174804688e+02, 3.129854737546577e+02, 3.130281066415284e+02, 3.130596924161852e+02, 3.130830382776924e+02, 3.13100341796875e+02, 3.131131897244286e+02, 3.13122680653391e+02, 3.131297607495605e+02, 3.131349792364056e+02, 3.131388854980469e+02]
-masFloRat.T=[2.931499938964844e+02, 2.931499938964844e+02]
-time=[0e+00, 6e+01]
-masFloRat.ports[1].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00]
-senRelTem.T_rel=[5e+00, 5e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_TemperatureWetBulb.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_TemperatureWetBulb.txt
deleted file mode 100644
index ea4be717..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_TemperatureWetBulb.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-last-generated=2016-05-27
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1",
- "linear": " "
-}
-senWetBul.T=[298.0599365234375, 298.08901977545610861853, 298.08734130872716150407, 298.08563232408533849593, 298.08395385768864116471, 298.082244873046875, 298.08050537082698383529, 298.07879638613667339087, 298.07705688529921417285, 298.07528686552541330457, 298.07354736328125, 298.07177734345896169543, 298.06997680605854839087, 298.06817627011332660913, 298.06637573125772178173, 298.0645751953125, 298.06274414178915321827, 298.06091308535542339087, 298.05905151425395160913, 298.05718994024209678173, 298.055328369140625, 298.05346679803915321827, 298.05157470640068595458, 298.04968261776957660913, 298.04776000850444006574, 298.04583740234375, 298.04391479608602821827, 298.04196167244418802511, 298.04000854239956197489, 298.03805541866069006574, 298.03607177734375, 298.03408813602680993426, 298.03210449470981302511, 298.03009032950893697489, 298.02807617061381506574, 298.02606201171875, 298.02401733524555993426, 298.02197265877231302511, 298.01989745841518697489, 298.01782226436381506574, 298.0157470703125, 298.01367187635815980684, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625, 298.01226806640625]
-time=[0., 120.]
-sou.T_in=[303.149993896484375, 303.39001463889871956781, 303.63000486373738340262, 303.86999513626261659738, 304.1099853134365389451, 304.350006103515625, 304.58999637604085819476, 304.82998664856592085926, 305.07000724791845414074, 305.30999752044345996183, 305.54998779296875, 305.79000858307216503817, 306.02999885559717085926, 306.26998893737157914074, 306.51000991822502328432, 306.75, 306.98999008177497671568, 307.23001106262876191977, 307.47000114440248808023, 307.70999160767814828432, 307.95001220703125, 308.19000228880622671568, 308.42999275208188691977, 308.67001335143373808023, 308.91000381470939828432, 309.149993896484375, 309.39001449583747671568, 309.63000457761245343136, 309.86999542238754656864, 310.10998550416252328432, 310.350006103515625, 310.58999618529060171568, 310.82998626725964186335, 311.07000762941879656864, 311.30999771119377328432, 311.54998779296875, 311.79000839232185171568, 312.02999847409682843136, 312.26998931887192156864, 312.51000991822502328432, 312.75, 312.98999008177497671568, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375]
-sou.X_in[1]=[0.01750000007450580597, 0.01739919931097055894, 0.01729840041007972215, 0.01719759962651752974, 0.01709680074565362098, 0.01699599996209144592, 0.01689519917852927086, 0.01679440025761231095, 0.01669359955415918029, 0.01659280063323929216, 0.01649199984967708588, 0.01639119906611487959, 0.0162904001451979509, 0.01618959944174482024, 0.01608880044071315032, 0.01598799973726272583, 0.01588720089645152822, 0.01578640003278346249, 0.01568559932933058856, 0.01558480032830175145, 0.01548399962484836578, 0.01538319985271755473, 0.01528239992036762446, 0.01518160014823732168, 0.01508080021588739141, 0.01498000044375658035, 0.01487919974030319469, 0.01477839996817238363, 0.01467759987560384241, 0.01457680010347303136, 0.01447600033134222031, 0.01437519962788883464, 0.01427439985575802359, 0.01417359976318948236, 0.01407279999105867131, 0.01397200021892786026, 0.01387120044679408977, 0.01377039974334366354, 0.01366959965078104293, 0.01356879987864431127, 0.01346800010651350021, 0.01336720033437972972, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866, 0.01329999975860118866]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_TraceSubstances.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_TraceSubstances.txt
deleted file mode 100644
index aa4cfd82..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_TraceSubstances.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-last-generated=2017-03-31
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "4",
- "linear": " "
-}
-masFraSou.V=[6.581559777259827e-01, 6.581559777259827e-01]
-time=[0e+00, 7.2e+03]
-vol.C[1]=[0e+00, 2.697662239370402e-05, 5.352245716494508e-05, 7.966899283928797e-05, 1.053883170243353e-04, 1.306841004407033e-04, 1.555708149680868e-04, 1.800455647753552e-04, 2.041147090494633e-04, 2.277903113281354e-04, 2.510649792384356e-04, 2.739629417192191e-04, 2.964785962831229e-04, 3.186184039805084e-04, 3.403979353606701e-04, 3.61808342859149e-04, 3.828726185020059e-04, 4.035844176542014e-04, 4.239476984366775e-04, 4.439761105459183e-04, 4.636705853044987e-04, 4.830363322980702e-04, 5.020785029046237e-04, 5.208037910051644e-04, 5.392191233113408e-04, 5.573289236053824e-04, 5.751388962380588e-04, 5.926545709371568e-04, 6.098796729929745e-04, 6.26817811280489e-04, 6.43475737888366e-04, 6.598586915060878e-04, 6.759717944078147e-04, 6.918178987689316e-04, 7.07399973180145e-04, 7.227244786918163e-04, 7.377960719168186e-04, 7.526194676756859e-04, 7.671972271054983e-04, 7.815322605893016e-04, 7.956302724778652e-04, 8.094955701380968e-04, 8.23132402729243e-04, 8.365436224266887e-04, 8.497323142364621e-04, 8.627029019407928e-04, 8.754590526223183e-04, 8.880042587406933e-04, 9.003420127555728e-04, 9.124756325036287e-04, 9.24408552236855e-04, 9.36143915168941e-04, 9.476850391365588e-04, 9.590353001840413e-04, 9.701980743557216e-04, 9.811761556193233e-04, 9.919728618115187e-04, 1.00259087048471e-03, 1.013033441267908e-03, 1.023303251713514e-03, 1.033403212204576e-03, 1.043336233124137e-03, 1.053104875609279e-03, 1.062711933627725e-03, 1.072160084731877e-03, 1.081451890058815e-03, 1.090589677914977e-03, 1.099576125852764e-03, 1.108413678593934e-03, 1.117104548029602e-03, 1.125651062466204e-03, 1.1340556666255e-03, 1.142321736551821e-03, 1.150451600551605e-03, 1.158446888439357e-03, 1.16630969569087e-03, 1.174042350612581e-03, 1.18164683226496e-03, 1.189125352539122e-03, 1.196479890495539e-03, 1.203712541610003e-03, 1.210824935697019e-03, 1.217820565216243e-03, 1.22470036149025e-03, 1.231466187164187e-03, 1.238120021298528e-03, 1.244663610123098e-03, 1.251098816283047e-03, 1.257427269592881e-03, 1.263650716282427e-03, 1.269770786166191e-03, 1.275789458304644e-03, 1.281709293834865e-03, 1.287530991248786e-03, 1.293256413191557e-03, 1.298886956647038e-03, 1.304424135014415e-03, 1.309869578108191e-03, 1.31522468291223e-03, 1.320490729995072e-03, 1.325669465586543e-03]
-senTraSub.C=[0e+00, 2.697662239370402e-05, 5.352245716494508e-05, 7.966899283928797e-05, 1.053883170243353e-04, 1.306841004407033e-04, 1.555708149680868e-04, 1.800455647753552e-04, 2.041147090494633e-04, 2.277903113281354e-04, 2.510649792384356e-04, 2.739629417192191e-04, 2.964785962831229e-04, 3.186184039805084e-04, 3.403979353606701e-04, 3.61808342859149e-04, 3.828726185020059e-04, 4.035844176542014e-04, 4.239476984366775e-04, 4.439761105459183e-04, 4.636705853044987e-04, 4.830363322980702e-04, 5.020785029046237e-04, 5.208037910051644e-04, 5.392191233113408e-04, 5.573289236053824e-04, 5.751388962380588e-04, 5.926545709371568e-04, 6.098796729929745e-04, 6.26817811280489e-04, 6.43475737888366e-04, 6.598586915060878e-04, 6.759717944078147e-04, 6.918178987689316e-04, 7.07399973180145e-04, 7.227244786918163e-04, 7.377960719168186e-04, 7.526194676756859e-04, 7.671972271054983e-04, 7.815322605893016e-04, 7.956302724778652e-04, 8.094955701380968e-04, 8.23132402729243e-04, 8.365436224266887e-04, 8.497323142364621e-04, 8.627029019407928e-04, 8.754590526223183e-04, 8.880042587406933e-04, 9.003420127555728e-04, 9.124756325036287e-04, 9.24408552236855e-04, 9.36143915168941e-04, 9.476850391365588e-04, 9.590353001840413e-04, 9.701980743557216e-04, 9.811761556193233e-04, 9.919728618115187e-04, 1.00259087048471e-03, 1.013033441267908e-03, 1.023303251713514e-03, 1.033403212204576e-03, 1.043336233124137e-03, 1.053104875609279e-03, 1.062711933627725e-03, 1.072160084731877e-03, 1.081451890058815e-03, 1.090589677914977e-03, 1.099576125852764e-03, 1.108413678593934e-03, 1.117104548029602e-03, 1.125651062466204e-03, 1.1340556666255e-03, 1.142321736551821e-03, 1.150451600551605e-03, 1.158446888439357e-03, 1.16630969569087e-03, 1.174042350612581e-03, 1.18164683226496e-03, 1.189125352539122e-03, 1.196479890495539e-03, 1.203712541610003e-03, 1.210824935697019e-03, 1.217820565216243e-03, 1.22470036149025e-03, 1.231466187164187e-03, 1.238120021298528e-03, 1.244663610123098e-03, 1.251098816283047e-03, 1.257427269592881e-03, 1.263650716282427e-03, 1.269770786166191e-03, 1.275789458304644e-03, 1.281709293834865e-03, 1.287530991248786e-03, 1.293256413191557e-03, 1.298886956647038e-03, 1.304424135014415e-03, 1.309869578108191e-03, 1.31522468291223e-03, 1.320490729995072e-03, 1.325669465586543e-03]
-senTraSubNoFlorRev.C=[0e+00, 2.697662239370402e-05, 5.352245716494508e-05, 7.966899283928797e-05, 1.053883170243353e-04, 1.306841004407033e-04, 1.555708149680868e-04, 1.800455647753552e-04, 2.041147090494633e-04, 2.277903113281354e-04, 2.510649792384356e-04, 2.739629417192191e-04, 2.964785962831229e-04, 3.186184039805084e-04, 3.403979353606701e-04, 3.61808342859149e-04, 3.828726185020059e-04, 4.035844176542014e-04, 4.239476984366775e-04, 4.439761105459183e-04, 4.636705853044987e-04, 4.830363322980702e-04, 5.020785029046237e-04, 5.208037910051644e-04, 5.392191233113408e-04, 5.573289236053824e-04, 5.751388962380588e-04, 5.926545709371568e-04, 6.098796729929745e-04, 6.26817811280489e-04, 6.43475737888366e-04, 6.598586915060878e-04, 6.759717944078147e-04, 6.918178987689316e-04, 7.07399973180145e-04, 7.227244786918163e-04, 7.377960719168186e-04, 7.526194676756859e-04, 7.671972271054983e-04, 7.815322605893016e-04, 7.956302724778652e-04, 8.094955701380968e-04, 8.23132402729243e-04, 8.365436224266887e-04, 8.497323142364621e-04, 8.627029019407928e-04, 8.754590526223183e-04, 8.880042587406933e-04, 9.003420127555728e-04, 9.124756325036287e-04, 9.24408552236855e-04, 9.36143915168941e-04, 9.476850391365588e-04, 9.590353001840413e-04, 9.701980743557216e-04, 9.811761556193233e-04, 9.919728618115187e-04, 1.00259087048471e-03, 1.013033441267908e-03, 1.023303251713514e-03, 1.033403212204576e-03, 1.043336233124137e-03, 1.053104875609279e-03, 1.062711933627725e-03, 1.072160084731877e-03, 1.081451890058815e-03, 1.090589677914977e-03, 1.099576125852764e-03, 1.108413678593934e-03, 1.117104548029602e-03, 1.125651062466204e-03, 1.1340556666255e-03, 1.142321736551821e-03, 1.150451600551605e-03, 1.158446888439357e-03, 1.16630969569087e-03, 1.174042350612581e-03, 1.18164683226496e-03, 1.189125352539122e-03, 1.196479890495539e-03, 1.203712541610003e-03, 1.210824935697019e-03, 1.217820565216243e-03, 1.22470036149025e-03, 1.231466187164187e-03, 1.238120021298528e-03, 1.244663610123098e-03, 1.251098816283047e-03, 1.257427269592881e-03, 1.263650716282427e-03, 1.269770786166191e-03, 1.275789458304644e-03, 1.281709293834865e-03, 1.287530991248786e-03, 1.293256413191557e-03, 1.298886956647038e-03, 1.304424135014415e-03, 1.309869578108191e-03, 1.31522468291223e-03, 1.320490729995072e-03, 1.325669465586543e-03]
-senPPM.ppm=[0e+00, 1.764756202697754e+01, 3.501330947875977e+01, 5.211784744262695e+01, 6.894290924072266e+01, 8.549089813232422e+01, 1.017712860107422e+02, 1.177821731567383e+02, 1.335277252197266e+02, 1.490158233642578e+02, 1.642416381835938e+02, 1.792210235595703e+02, 1.939503021240234e+02, 2.084337463378906e+02, 2.226814727783203e+02, 2.366877136230469e+02, 2.504675445556641e+02, 2.640167846679688e+02, 2.773380432128906e+02, 2.904402160644531e+02, 3.033239440917969e+02, 3.159926147460938e+02, 3.284496459960938e+02, 3.406993103027344e+02, 3.527462768554688e+02, 3.645933532714844e+02, 3.762442626953125e+02, 3.877026672363282e+02, 3.989709777832032e+02, 4.100515441894531e+02, 4.209488525390625e+02, 4.316662292480469e+02, 4.422071228027344e+02, 4.525733337402344e+02, 4.627667846679688e+02, 4.72791748046875e+02, 4.826513061523438e+02, 4.923484802246094e+02, 5.018849487304688e+02, 5.112626342773438e+02, 5.204852905273438e+02, 5.295556640625e+02, 5.384766235351562e+02, 5.472499389648438e+02, 5.558777465820312e+02, 5.643628540039062e+02, 5.727076416015625e+02, 5.809144897460938e+02, 5.88985595703125e+02, 5.969231567382812e+02, 6.047294311523438e+02, 6.12406494140625e+02, 6.199564208984375e+02, 6.273815307617188e+02, 6.346840209960938e+02, 6.418656616210938e+02, 6.489285888671875e+02, 6.55874755859375e+02, 6.627059936523438e+02, 6.694243774414062e+02, 6.760315551757812e+02, 6.82529541015625e+02, 6.889199829101562e+02, 6.952047119140625e+02, 7.01385498046875e+02, 7.074639892578125e+02, 7.134417724609375e+02, 7.19320556640625e+02, 7.251018676757812e+02, 7.307872314453125e+02, 7.363782348632812e+02, 7.418763427734375e+02, 7.472838745117188e+02, 7.526022338867188e+02, 7.578325805664062e+02, 7.629762573242188e+02, 7.680347900390625e+02, 7.73009521484375e+02, 7.7790185546875e+02, 7.827130126953125e+02, 7.874443969726562e+02, 7.920972900390625e+02, 7.966736450195312e+02, 8.011742553710938e+02, 8.05600341796875e+02, 8.09953125e+02, 8.142338256835938e+02, 8.18443603515625e+02, 8.2258349609375e+02, 8.2665478515625e+02, 8.30658447265625e+02, 8.34595703125e+02, 8.384683227539062e+02, 8.4227685546875e+02, 8.460222778320312e+02, 8.497056274414062e+02, 8.533280029296875e+02, 8.568902587890625e+02, 8.603934326171875e+02, 8.638384399414062e+02, 8.672261962890625e+02]
-masFraVol.V=[0e+00, 1.775482451193966e-05, 3.522612678352743e-05, 5.24346214660909e-05, 6.936195131856948e-05, 8.601052104495466e-05, 1.023898585117422e-04, 1.184980646939948e-04, 1.343393232673407e-04, 1.499215577496216e-04, 1.652399078011513e-04, 1.803103368729353e-04, 1.951291487785056e-04, 2.097006217809394e-04, 2.240349422208965e-04, 2.38126318436116e-04, 2.519898989703506e-04, 2.656214928720146e-04, 2.790237194858491e-04, 2.922055427916348e-04, 3.051675739698112e-04, 3.179132472723722e-04, 3.304459969513118e-04, 3.427701012697071e-04, 3.54890275048092e-04, 3.668093704618514e-04, 3.785311128012836e-04, 3.900591400451959e-04, 4.013959551230074e-04, 4.125438863411546e-04, 4.23507415689528e-04, 4.342899192124605e-04, 4.44894889369607e-04, 4.553241014946252e-04, 4.655795346479863e-04, 4.756654379889369e-04, 4.855848965235054e-04, 4.953410243615508e-04, 5.049354513175786e-04, 5.143701564520597e-04, 5.236488650552928e-04, 5.327743710950017e-04, 5.417495267465711e-04, 5.505761946551502e-04, 5.59256412088871e-04, 5.677930894307792e-04, 5.761886131949723e-04, 5.844453116878867e-04, 5.925655132159591e-04, 6.005513132549822e-04, 6.084049819037318e-04, 6.161287310533226e-04, 6.237245979718864e-04, 6.31194852758199e-04, 6.385416490957141e-04, 6.457669660449028e-04, 6.528728408738971e-04, 6.598611944355071e-04, 6.667340057902038e-04, 6.734931375831366e-04, 6.801405688747764e-04, 6.866779876872897e-04, 6.931073148734868e-04, 6.99430238455534e-04, 7.056485628709197e-04, 7.117639761418104e-04, 7.177781662903726e-04, 7.2369264671579e-04, 7.295091054402292e-04, 7.352290558628738e-04, 7.408540113829076e-04, 7.463854853995144e-04, 7.518259226344526e-04, 7.571766036562622e-04, 7.624387508258224e-04, 7.676137029193342e-04, 7.727029733359814e-04, 7.777079590596259e-04, 7.826299988664687e-04, 7.874704315327108e-04, 7.922305958345532e-04, 7.969117141328752e-04, 8.015158819034696e-04, 8.060438558459282e-04, 8.104968583211303e-04, 8.14876111689955e-04, 8.191828383132815e-04, 8.234181441366673e-04, 8.275832515209913e-04, 8.316792664118111e-04, 8.357072365470231e-04, 8.396684424951673e-04, 8.435646304860711e-04, 8.473962661810219e-04, 8.511644555255771e-04, 8.54870246257633e-04, 8.585145696997643e-04, 8.620984735898674e-04, 8.656229474581778e-04, 8.690889226272702e-04, 8.724972722120583e-04]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_Velocity.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_Velocity.txt
deleted file mode 100644
index 939a8c02..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_Velocity.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-last-generated=2016-05-25
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "1",
- "linear": " "
-}
-senDyn.v=[10.61032962799072265625, 10.39812279590792520878, 10.18591596382513309038, 9.97371004325494503462, 9.76150325333382617998, 9.54929637908935546875, 9.33708950484564326189, 9.1248835842748636793, 8.91267687867679647695, 8.70047000443252649404, 8.4882640838623046875, 8.27605720961776647471, 8.0638503353734964918, 7.8516441066125866044, 7.63943706372238384716, 7.4272308349609375, 7.21502412936233294971, 7.00281756330901927754, 6.79061085771148853496, 6.57840429165817486279, 6.3661975860595703125, 6.15399135729812396534, 5.94178431440765297822, 5.72957808564727866241, 5.51737104275680856347, 5.30516481399536132812, 5.09295810839675588966, 4.88075187963530954249, 4.66854449945707639102, 4.45633827069259957909, 4.24413204193115234375, 4.03192533633254690528, 3.81971886915252278882, 3.60751172738983560961, 3.3953052602098097168, 3.18309879302978515625, 2.9708923258497605957, 2.75868585866973470289, 2.54647871690856364424, 2.33427224972777969114, 2.12206602096557617188, 1.9098594345762618385, 1.69765296739623594569, 1.4854458256343070488, 1.27323935845390345811, 1.06103301048278808594, 0.84882648369792790266, 0.63662001651809263514, 0.42441290455810848359, 0.21220645227905424179, 0.00000000000000058885, -0.21220645227905424179, -0.42441290455810848359, -0.63662001651809263514, -0.84882580912479455026, -1.06103301048278808594, -1.27324003302760768719, -1.48544582563001692499, -1.69765296740052362701, -1.90985876000369314553, -2.12206602096557617188, -2.33427292430110622234, -2.54647871690427596292, -2.75868585867402194012, -2.97089165127870735716, -3.18309879302978515625, -3.39530593478389430828, -3.60751172738554837238, -3.81971886915681269059, -4.03192466175846409016, -4.24413204193115234375, -4.45633894526667972968, -4.66854449945278648926, -4.88075187963959855608, -5.09295743382873578042, -5.30516481399536132812, -5.51737171733089137859, -5.72957774835112410017, -5.94178465170381020499, -6.15399068272404292657, -6.3661975860595703125, -6.57840496623225856609, -6.79061052041533042001, -7.00281790060517472796, -7.21502345478824924641, -7.4272308349609375, -7.63943773829646755047, -7.85164376931670027204, -8.06385067266938371233, -8.27605670368961554573, -8.4882640838623046875, -8.70047051036067742302, -8.91267654138090925642, -9.12488392157075267619, -9.33708899892879351512, -9.54929637908935546875, -9.76150375926204105781, -9.97370979028227466756, -10.18591621679780168108, -10.39812224781803351448, -10.61032962799072265625]
-senDyn.port_a.m_flow=[0.10000000149011611938, 0.09799999751647298085, 0.096000000993410467, 0.09399999662240374199, 0.0920000004967045093, 0.09000000357627868652, 0.08799999920527226682, 0.0860000022848477208, 0.08399999950329162246, 0.08200000258286770094, 0.07999999821186065674, 0.07800000129143420946, 0.07599999692042969102, 0.0740000015894541896, 0.07199999562900376293, 0.07000000029802322388, 0.06800000496704268482, 0.06599999900658971852, 0.06400000367561929637, 0.06199999771516633701, 0.05999999865889549255, 0.05799999960263649279, 0.05600000109274637372, 0.05400000203649155117, 0.05199999980132891109, 0.05000000074505805969, 0.0480000016887872083, 0.04600000263251636384, 0.04399999721847201034, 0.04199999816220117976, 0.03999999910593032837, 0.03800000004967132167, 0.03600000099341232884, 0.03399999930461089503, 0.03200000024835188833, 0.02999999932944774628, 0.02800000213582205799, 0.02600000307955121007, 0.02399999766550684963, 0.0219999986092360017, 0.01999999955296516418, 0.01800000049670024901, 0.01600000330306862797, 0.01399999788901834692, 0.01199999883275047058, 0.00999999977648258209, 0.00800000165153430878, 0.00600000259526643157, 0.0039999976468744888, 0.00199999882343761433, 0.00000000000000000555, -0.00199999882343761433, -0.0039999976468744888, -0.00600000259526643157, -0.00799999529382981918, -0.00999999977648258209, -0.01200000519045794391, -0.01399999788897791225, -0.01600000330310903662, -0.01799999413900164533, -0.01999999955296516418, -0.02200000496692868304, -0.02399999766546644098, -0.02600000307959161872, -0.02799999577810569074, -0.02999999932944774628, -0.03200000660605641783, -0.03399999930457048292, -0.03600000099345276178, -0.03799999369196680604, -0.03999999910593032837, -0.04200000451989382294, -0.04399999721843157741, -0.0460000026325567829, -0.04799999533109453737, -0.05000000074505805969, -0.05200000615902158202, -0.0539999988575356471, -0.05600000427168454198, -0.05799999324493199798, -0.05999999865889549255, -0.06200000407285901488, -0.06400000049668704005, -0.06600000218552194708, -0.06799999860925526329, -0.07000000029802322388, -0.07200000198679118446, -0.07399999841052450067, -0.07600000009935937995, -0.07799999652318743981, -0.07999999821186065674, -0.08200000735111447059, -0.08399999632436193353, -0.08600000546377743749, -0.08799999443702487267, -0.09000000357627868652, -0.09200000526495188957, -0.09399999423819933864, -0.09600000337761484259, -0.09799999235086230553, -0.10000000149011611938]
-senSteSta.v=[10.61032962799072265625, 10.39812279590792520878, 10.18591596382513309038, 9.97371004325494503462, 9.76150325333382617998, 9.54929637908935546875, 9.33708950484564326189, 9.1248835842748636793, 8.91267687867679647695, 8.70047000443252649404, 8.4882640838623046875, 8.27605720961776647471, 8.0638503353734964918, 7.8516441066125866044, 7.63943706372238384716, 7.4272308349609375, 7.21502412936233294971, 7.00281756330901927754, 6.79061085771148853496, 6.57840429165817486279, 6.3661975860595703125, 6.15399135729812396534, 5.94178431440765297822, 5.72957808564727866241, 5.51737104275680856347, 5.30516481399536132812, 5.09295810839675588966, 4.88075187963530954249, 4.66854449945707639102, 4.45633827069259957909, 4.24413204193115234375, 4.03192533633254690528, 3.81971886915252278882, 3.60751172738983560961, 3.3953052602098097168, 3.18309879302978515625, 2.9708923258497605957, 2.75868585866973470289, 2.54647871690856364424, 2.33427224972777969114, 2.12206602096557617188, 1.9098594345762618385, 1.69765296739623594569, 1.4854458256343070488, 1.27323935845390345811, 1.06103301048278808594, 0.84882648369792790266, 0.63662001651809263514, 0.42441290455810848359, 0.21220645227905424179, 0.00000000000000058885, -0.21220645227905424179, -0.42441290455810848359, -0.63662001651809263514, -0.84882580912479455026, -1.06103301048278808594, -1.27324003302760768719, -1.48544582563001692499, -1.69765296740052362701, -1.90985876000369314553, -2.12206602096557617188, -2.33427292430110622234, -2.54647871690427596292, -2.75868585867402194012, -2.97089165127870735716, -3.18309879302978515625, -3.39530593478389430828, -3.60751172738554837238, -3.81971886915681269059, -4.03192466175846409016, -4.24413204193115234375, -4.45633894526667972968, -4.66854449945278648926, -4.88075187963959855608, -5.09295743382873578042, -5.30516481399536132812, -5.51737171733089137859, -5.72957774835112410017, -5.94178465170381020499, -6.15399068272404292657, -6.3661975860595703125, -6.57840496623225856609, -6.79061052041533042001, -7.00281790060517472796, -7.21502345478824924641, -7.4272308349609375, -7.63943773829646755047, -7.85164376931670027204, -8.06385067266938371233, -8.27605670368961554573, -8.4882640838623046875, -8.70047051036067742302, -8.91267654138090925642, -9.12488392157075267619, -9.33708899892879351512, -9.54929637908935546875, -9.76150375926204105781, -9.97370979028227466756, -10.18591621679780168108, -10.39812224781803351448, -10.61032962799072265625]
-time=[0., 60.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_VolumeFlowRate.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_VolumeFlowRate.txt
deleted file mode 100644
index 4988e7aa..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sensors_Examples_VolumeFlowRate.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'number of continuous time states': '1', 'linear': ' '}
-senSteSta.V_flow=[8.33333301544189453125, 8.16666699118074035368, 8.00000001324565346295, 7.83333347903358934161, 7.66666653421184829398, 7.5, 7.3333334657881525942, 7.16666645473925090215, 7.00000005298169636347, 6.83333351877000616525, 6.66666650772094726562, 6.49999997350904656912, 6.33333343929735725908, 6.16666656070264274092, 5.9999998940370291578, 5.83333349227905273438, 5.66666661368391810782, 5.49999994701809313824, 5.33333354526095959613, 5.16666640175797642343, 5., 4.83333359824202357657, 4.66666645473904129204, 4.50000005298190597358, 4.33333338631608189218, 4.16666650772094726562, 4.0000001059629708422, 3.83333346578641442903, 3.66666653421358468279, 3.49999989403702960189, 3.33333325386047363281, 3.1666668521024967653, 3.0000002119259416844, 2.83333304193453194841, 2.6666666401765550809, 2.5, 2.3333333598234449191, 2.16666695806546805159, 1.99999978807405809356, 1.83333326710641286716, 1.66666662693023681641, 1.50000010596297150833, 1.33333358499570509004, 1.16666641500429490996, 0.99999989403684008682, 0.8333333134651184082, 0.66666679249785198991, 0.50000021192632082556, 0.33333313134131048461, 0.1666665656706552423, 0., -0.1666665656706552423, -0.33333313134131048461, -0.50000021192632082556, -0.66666626268897877239, -0.8333333134651184082, -1.00000042384514675753, -1.16666641500092560513, -1.33333358499907261852, -1.49999957615485324247, -1.66666662693023681641, -1.83333379691490994112, -1.99999978807069056508, -2.16666695806883558006, -2.33333283001532665324, -2.5, -2.66666716998467334676, -2.83333304193116441994, -3.00000021192931143332, -3.16666632229437938761, -3.33333325386047363281, -3.50000042384514475913, -3.66666653421021493386, -3.83333346578978284569, -3.99999957615485302043, -4.16666650772094726562, -4.33333391612419926986, -4.49999978807069034303, -4.66666671965025869895, -4.83333306843390797525, -5., -5.16666693156609380111, -5.33333328034974130105, -5.50000021192930965697, -5.66666608387580073014, -5.83333349227905273438, -6.00000042384514653548, -6.16666629579163760866, -6.33333370420836239134, -6.49999957615485346452, -6.66666650772094726562, -6.83333391612419926986, -6.99999978807069034303, -7.16666671965025869895, -7.33333306843390619889, -7.5, -7.66666693156609202475, -7.83333328034974130105, -8.00000021193234189809, -8.16666656070689533919, -8.33333301544189453125]
-senDyn.V_flow=[8.33333301544189453125, 8.16666699118074035368, 8.00000001324565346295, 7.83333347903358934161, 7.66666653421184829398, 7.5, 7.3333334657881525942, 7.16666645473925090215, 7.00000005298169636347, 6.83333351877000616525, 6.66666650772094726562, 6.49999997350904656912, 6.33333343929735725908, 6.16666656070264274092, 5.9999998940370291578, 5.83333349227905273438, 5.66666661368391810782, 5.49999994701809313824, 5.33333354526095959613, 5.16666640175797642343, 5., 4.83333359824202357657, 4.66666645473904129204, 4.50000005298190597358, 4.33333338631608189218, 4.16666650772094726562, 4.0000001059629708422, 3.83333346578641442903, 3.66666653421358468279, 3.49999989403702960189, 3.33333325386047363281, 3.1666668521024967653, 3.0000002119259416844, 2.83333304193453194841, 2.6666666401765550809, 2.5, 2.3333333598234449191, 2.16666695806546805159, 1.99999978807405809356, 1.83333326710641286716, 1.66666662693023681641, 1.50000010596297150833, 1.33333358499570509004, 1.16666641500429490996, 0.99999989403684008682, 0.8333333134651184082, 0.66666679249785198991, 0.50000021192632082556, 0.33333313134131048461, 0.1666665656706552423, 0., -0.1666665656706552423, -0.33333313134131048461, -0.50000021192632082556, -0.66666626268897877239, -0.8333333134651184082, -1.00000042384514675753, -1.16666641500092560513, -1.33333358499907261852, -1.49999957615485324247, -1.66666662693023681641, -1.83333379691490994112, -1.99999978807069056508, -2.16666695806883558006, -2.33333283001532665324, -2.5, -2.66666716998467334676, -2.83333304193116441994, -3.00000021192931143332, -3.16666632229437938761, -3.33333325386047363281, -3.50000042384514475913, -3.66666653421021493386, -3.83333346578978284569, -3.99999957615485302043, -4.16666650772094726562, -4.33333391612419926986, -4.49999978807069034303, -4.66666671965025869895, -4.83333306843390797525, -5., -5.16666693156609380111, -5.33333328034974130105, -5.50000021192930965697, -5.66666608387580073014, -5.83333349227905273438, -6.00000042384514653548, -6.16666629579163760866, -6.33333370420836239134, -6.49999957615485346452, -6.66666650772094726562, -6.83333391612419926986, -6.99999978807069034303, -7.16666671965025869895, -7.33333306843390619889, -7.5, -7.66666693156609202475, -7.83333328034974130105, -8.00000021193234189809, -8.16666656070689533919, -8.33333301544189453125]
-senDyn.port_a.m_flow=[10., 9.80000019868213989582, 9.60000039736428334436, 9.39999960263571665564, 9.19999984105421830805, 9., 8.80000015894578346831, 8.6000003178916912816, 8.3999996821083087184, 8.19999984105428048053, 8., 7.80000015894571951947, 7.59999984105453307848, 7.40000015894546692152, 7.19999968210957153048, 7., 6.80000031789042846952, 6.59999984105427994763, 6.40000015894572005237, 6.19999968210957153048, 6., 5.80000031789042846952, 5.59999984105428083581, 5.40000015894571916419, 5.19999968210957241865, 5., 4.80000031789042758135, 4.60000015894369695957, 4.39999984105630126408, 4.19999968210957241865, 4., 3.80000007947184847978, 3.6000001589452144124, 3.3999998410547855876, 3.19999992052815018795, 3., 2.80000007947184981205, 2.6000001589452144124, 2.3999998410547855876, 2.19999992052815018795, 2., 1.80000007947222884219, 1.60000027815298806466, 1.39999972184701193534, 1.19999992052777226803, 1., 0.80000013907649347722, 0.60000027815298806466, 0.3999997516491459737, 0.19999987582452563584, 0., -0.19999987582452563584, -0.3999997516491459737, -0.60000027815298806466, -0.79999950330599722825, -1., -1.20000055629789215139, -1.39999972184296850308, -1.60000027815702905443, -1.79999944370210784861, -2., -2.20000055629789192935, -2.39999984105074437579, -2.60000015894925562421, -2.79999944370210807065, -3., -3.20000055629789192935, -3.39999984105074437579, -3.60000015894925784465, -3.79999944370210807065, -4., -4.20000031787931060734, -4.39999984105225827591, -4.60000015894773994773, -4.79999968212068672813, -5., -5.20000031787931327187, -5.39999984105226005227, -5.60000015894774172409, -5.79999968212068939266, -6., -6.20000031787931327187, -6.39999984105225827591, -6.60000015894773994773, -6.79999968212068672813, -7., -7.20000031787931327187, -7.39999984105226005227, -7.60000015894773994773, -7.79999968212068672813, -8., -8.20000031787931327187, -8.39999936421510184914, -8.60000063578489992722, -8.79999968212068672813, -9., -9.20000031787930971916, -9.39999936421510007278, -9.60000063578489815086, -9.79999968212068672813, -10.]
-time=[0., 60.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sources_Examples_MassFlowSource_WeatherData.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sources_Examples_MassFlowSource_WeatherData.txt
deleted file mode 100644
index 74941f53..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sources_Examples_MassFlowSource_WeatherData.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-last-generated=2017-05-30
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1",
- "linear": " "
-}
-senTem.T=[2.609500122070312e+02, 2.721241760253906e+02, 2.514559326171875e+02, 2.749552612304688e+02, 2.752900085449219e+02, 2.748500061035156e+02, 2.6801806640625e+02, 2.625499877929688e+02, 2.559499969482422e+02, 2.705828857421875e+02, 2.609500122070312e+02, 2.712843933105469e+02, 2.722561645507812e+02, 2.720389404296875e+02, 2.639713134765625e+02, 2.7425e+02, 2.713699951171875e+02, 2.732699890136719e+02, 2.7875e+02, 2.804643859863281e+02, 2.725499877929688e+02, 2.804530639648438e+02, 2.735158996582031e+02, 2.737742919921875e+02, 2.856371154785156e+02, 2.764500122070312e+02, 2.732782287597656e+02, 2.810541381835938e+02, 2.796654968261719e+02, 2.987295837402344e+02, 2.809500122070312e+02, 2.825499877929688e+02, 2.8153857421875e+02, 2.886300048828125e+02, 2.888379821777344e+02, 2.8425e+02, 2.879100036621094e+02, 2.791740112304688e+02, 2.911358032226562e+02, 2.938409118652344e+02, 2.825499877929688e+02, 3.0212158203125e+02, 2.913900146484375e+02, 3.000140075683594e+02, 2.889259948730469e+02, 2.914500122070312e+02, 2.8875e+02, 3.0375e+02, 2.79756103515625e+02, 2.962140502929688e+02, 2.959500122070312e+02, 2.957225341796875e+02, 2.929080505371094e+02, 3.001300048828125e+02, 2.979100036621094e+02, 2.998500061035156e+02, 3.010237731933594e+02, 2.920499877929688e+02, 3.001717224121094e+02, 2.98227783203125e+02, 2.859500122070312e+02, 2.96918212890625e+02, 2.927784729003906e+02, 2.895780944824219e+02, 3.005049743652344e+02, 2.920499877929688e+02, 2.935899963378906e+02, 2.937058410644531e+02, 2.910376281738281e+02, 2.925608520507812e+02, 2.8925e+02, 2.925499877929688e+02, 2.856871643066406e+02, 2.925940246582031e+02, 2.873388061523438e+02, 2.881499938964844e+02, 2.888507995605469e+02, 2.794700012207031e+02, 2.850619201660156e+02, 2.799443969726562e+02, 2.7925e+02, 2.823743286132812e+02, 2.778880310058594e+02, 2.807859802246094e+02, 2.935283203125e+02, 2.864500122070312e+02, 2.748500061035156e+02, 2.840026550292969e+02, 2.754036865234375e+02, 2.703080749511719e+02, 2.659500122070312e+02, 2.6183251953125e+02, 2.719844055175781e+02, 2.773255615234375e+02, 2.656995239257812e+02, 2.725499877929688e+02, 2.66414794921875e+02, 2.67631591796875e+02, 2.699956970214844e+02, 2.683118286132812e+02, 2.675e+02]
-time=[0e+00, 3.1536e+07]
-senRelHum.phi=[7.300000190734863e-01, 9.042285680770874e-01, 6.391893625259399e-01, 8.199999928474426e-01, 5.619999766349792e-01, 7.900000214576721e-01, 8.226400017738342e-01, 5.660960078239441e-01, 7.599999904632568e-01, 7.634400129318237e-01, 5.799999833106995e-01, 8.040872812271118e-01, 6.448000073432922e-01, 5.717599987983704e-01, 7.877600193023682e-01, 7.300000190734863e-01, 7.157217264175415e-01, 8.899999856948853e-01, 7.525777816772461e-01, 9.148533344268799e-01, 6.700000166893005e-01, 3.339999914169312e-01, 6.624000072479248e-01, 8.821028470993042e-01, 5.761671662330627e-01, 9.700000286102295e-01, 6.884727478027344e-01, 7.729292511940002e-01, 9.890000224113464e-01, 5.339199900627136e-01, 5e-01, 7.68559992313385e-01, 9.890000224113464e-01, 6.562285423278809e-01, 4.40771758556366e-01, 3.799999952316284e-01, 5.115519762039185e-01, 8.327999711036682e-01, 6.21999979019165e-01, 4.900000095367432e-01, 5.600000023841858e-01, 5.407481789588928e-01, 6.443039774894714e-01, 5.021230578422546e-01, 7.329013347625732e-01, 8.399999737739563e-01, 6.99999988079071e-01, 3.537091016769409e-01, 6.233919858932495e-01, 6.231039762496948e-01, 6.200000047683716e-01, 7.779200077056885e-01, 5.318209528923035e-01, 5.904533267021179e-01, 9.14680004119873e-01, 4.900000095367432e-01, 6.579999923706055e-01, 9.431952834129333e-01, 6.782857179641724e-01, 9.600800275802612e-01, 8.00000011920929e-01, 6.547200083732605e-01, 9.198189377784729e-01, 8.490825295448303e-01, 7.454584836959839e-01, 8.100000023841858e-01, 6.982399821281433e-01, 5.691999793052673e-01, 8.34685742855072e-01, 6.814560294151306e-01, 7.5e-01, 9.300000071525574e-01, 9.098399877548218e-01, 5.856114029884338e-01, 8.519999980926514e-01, 6.200000047683716e-01, 5.729066729545593e-01, 7.559999823570251e-01, 7.603448629379272e-01, 8.710946440696716e-01, 7.900000214576721e-01, 5.697600245475769e-01, 7.88096010684967e-01, 7.852799892425537e-01, 7.687680125236511e-01, 9.599999785423279e-01, 6.955599784851074e-01, 4.803897440433502e-01, 6.366400122642517e-01, 5.987200140953064e-01, 7.699999809265137e-01, 8.639360070228577e-01, 7.559999823570251e-01, 6.579733490943909e-01, 7.699999809265137e-01, 8.199999928474426e-01, 6.838399767875671e-01, 8.567009568214417e-01, 5.87634265422821e-01, 9.477120041847229e-01, 7.350000143051147e-01]
-senMasFra.X=[9.569631656631827e-04, 3.122302237898111e-03, 3.440451109781861e-04, 3.511981107294559e-03, 2.463798969984055e-03, 3.357730805873871e-03, 2.008442999795079e-03, 8.56626546010375e-04, 6.286120624281466e-04, 2.31685396283865e-03, 7.602360565215349e-04, 2.588227624073625e-03, 2.249939134344459e-03, 1.958987209945917e-03, 1.352632534690201e-03, 2.970954868942499e-03, 2.319934545084834e-03, 3.376510925590992e-03, 4.214771557599306e-03, 5.772227887064219e-03, 2.396883442997932e-03, 2.101039979606867e-03, 2.557996427640319e-03, 3.471774980425835e-03, 5.141228903084993e-03, 4.624347668141127e-03, 2.612367738038301e-03, 5.075159482657909e-03, 5.907181184738874e-03, 1.08245899900794e-02, 3.256241790950298e-03, 5.586487706750631e-03, 6.718186195939779e-03, 7.119801826775074e-03, 4.839675035327673e-03, 3.090065438300371e-03, 5.293064285069704e-03, 4.804941825568676e-03, 7.916525937616825e-03, 7.377535570412874e-03, 4.066765308380127e-03, 1.339267566800117e-02, 8.334522135555744e-03, 1.098277606070042e-02, 8.108760230243206e-03, 1.092405617237091e-02, 7.655843626707792e-03, 9.597562253475189e-03, 3.741857828572392e-03, 1.08663160353899e-02, 1.063929218798876e-02, 1.318661775439978e-02, 7.55943451076746e-03, 1.301904022693634e-02, 1.773514784872532e-02, 1.061242632567883e-02, 1.530811097472906e-02, 1.274954248219728e-02, 1.501034572720528e-02, 1.898571476340294e-02, 7.296089548617601e-03, 1.192050147801638e-02, 1.30126066505909e-02, 9.803484193980694e-03, 1.684068702161312e-02, 1.093712076544762e-02, 1.037023775279522e-02, 8.504758588969707e-03, 1.057503558695316e-02, 9.490804746747017e-03, 8.473432622849941e-03, 1.297081541270018e-02, 8.160275407135487e-03, 8.166247047483921e-03, 8.512625470757484e-03, 6.520029157400131e-03, 6.301255896687508e-03, 4.45106765255332e-03, 6.53805211186409e-03, 5.301903001964092e-03, 4.581416957080364e-03, 4.088999703526497e-03, 4.156132694333792e-03, 5.062720272690058e-03, 1.138128805905581e-02, 9.055953472852707e-03, 2.95561202801764e-03, 3.844449063763022e-03, 2.814380219206214e-03, 1.774911885149777e-03, 1.572456676512957e-03, 1.226347638294101e-03, 2.579501131549478e-03, 3.33404541015625e-03, 1.538534881547093e-03, 2.934456337243319e-03, 1.453861361369491e-03, 2.023493871092796e-03, 1.69674283824861e-03, 2.37315334379673e-03, 1.716217491775751e-03]
-sin_with_h.medium.h=[-9.8897919921875e+03, 6.77421484375e+03, -2.0970146484375e+04, 1.06050322265625e+04, 8.31933984375e+03, 1.011280859375e+04, -1.483858947753906e+02, -8.5289189453125e+03, -1.5740265625e+04, 3.206897216796875e+03, -1.0379759765625e+04, 4.59227734375e+03, 4.72622119140625e+03, 3.779882568359375e+03, -5.8614072265625e+03, 8.5397919921875e+03, 4.0079833984375e+03, 8.5657685546875e+03, 1.61949609375e+04, 2.183076953125e+04, 5.3898125e+03, 1.2614712890625e+04, 6.76648583984375e+03, 9.31286328125e+03, 2.547515625e+04, 1.4898392578125e+04, 6.662853515625e+03, 2.067887109375e+04, 2.136140234375e+04, 5.304198046875e+04, 1.60123984375e+04, 2.34731328125e+04, 2.5289322265625e+04, 3.347373046875e+04, 2.7951052734375e+04, 1.8924189453125e+04, 2.8153310546875e+04, 1.8102091796875e+04, 3.801467578125e+04, 3.939673828125e+04, 1.96600859375e+04, 6.29720546875e+04, 3.932402734375e+04, 5.474523046875e+04, 3.626003125e+04, 4.590174609375e+04, 3.494296875e+04, 5.503805078125e+04, 1.60252890625e+04, 5.059329296875e+04, 4.9752984375e+04, 5.59421015625e+04, 3.89104140625e+04, 6.000266015625e+04, 6.96394296875e+04, 5.3644015625e+04, 6.669121875e+04, 5.11059765625e+04, 6.50713359375e+04, 7.311840625e+04, 3.12041796875e+04, 5.39661328125e+04, 5.250909765625e+04, 4.118284375e+04, 7.00313125e+04, 4.6543828125e+04, 4.667977734375e+04, 4.2099e+04, 4.46048046875e+04, 4.34212890625e+04, 3.750528125e+04, 5.21714921875e+04, 3.3108734375e+04, 4.012018359375e+04, 3.566728125e+04, 3.1480208984375e+04, 3.163902734375e+04, 1.751412890625e+04, 2.840165625e+04, 2.012606640625e+04, 1.761865625e+04, 1.9538525390625e+04, 1.5177837890625e+04, 2.03767578125e+04, 4.916343359375e+04, 3.613173046875e+04, 9.10651953125e+03, 2.056843359375e+04, 9.3114169921875e+03, 1.575791748046875e+03, -3.3201318359375e+03, -8.330125e+03, 5.27620849609375e+03, 1.2550994140625e+04, -3.65706689453125e+03, 6.73401416015625e+03, -3.14784521484375e+03, -5.002590637207031e+02, 1.065764526367188e+03, 1.058285278320312e+03, -1.399896118164062e+03]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sources_Examples_Outside.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sources_Examples_Outside.txt
new file mode 100644
index 00000000..3d1ecf9b
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sources_Examples_Outside.txt
@@ -0,0 +1,12 @@
+last-generated=2017-03-31
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "number of continuous time states": "3",
+ "linear": " "
+}
+senTem.T=[2.931499938964844e+02, 2.721241149902344e+02, 2.514559020996094e+02, 2.749553833007812e+02, 2.752897033691406e+02, 2.748500671386719e+02, 2.680184631347656e+02, 2.625499877929688e+02, 2.559499969482422e+02, 2.705827331542969e+02, 2.60949462890625e+02, 2.712847900390625e+02, 2.722565612792969e+02, 2.720381774902344e+02, 2.639714660644531e+02, 2.742501831054688e+02, 2.713695373535156e+02, 2.732698364257812e+02, 2.7875e+02, 2.804637756347656e+02, 2.725501098632812e+02, 2.804530639648438e+02, 2.735154418945312e+02, 2.737742919921875e+02, 2.856378784179688e+02, 2.764503173828125e+02, 2.732781677246094e+02, 2.810540161132812e+02, 2.796651611328125e+02, 2.987299194335938e+02, 2.809498901367188e+02, 2.825499877929688e+02, 2.815384216308594e+02, 2.886298217773438e+02, 2.888382873535156e+02, 2.842501525878906e+02, 2.879098205566406e+02, 2.791741638183594e+02, 2.911360473632812e+02, 2.938404541015625e+02, 2.825501098632812e+02, 3.021210021972656e+02, 2.913893737792969e+02, 3.000142211914062e+02, 2.889258117675781e+02, 2.914498291015625e+02, 2.8875e+02, 3.0375e+02, 2.797555847167969e+02, 2.962147827148438e+02, 2.959495849609375e+02, 2.957228393554688e+02, 2.929083557128906e+02, 3.001296997070312e+02, 2.9791015625e+02, 2.998503723144531e+02, 3.010234375e+02, 2.920499877929688e+02, 3.001724243164062e+02, 2.98227294921875e+02, 2.859501037597656e+02, 2.969177551269531e+02, 2.927781677246094e+02, 2.895787048339844e+02, 3.005044250488281e+02, 2.920497741699219e+02, 2.935903015136719e+02, 2.937060852050781e+02, 2.910377502441406e+02, 2.925613403320312e+02, 2.892497863769531e+02, 2.925499877929688e+02, 2.856875305175781e+02, 2.925940856933594e+02, 2.873389587402344e+02, 2.881503295898438e+02, 2.88850830078125e+02, 2.794696960449219e+02, 2.850623779296875e+02, 2.799443054199219e+02, 2.792501525878906e+02, 2.823743896484375e+02, 2.778875122070312e+02, 2.807869262695312e+02, 2.935285339355469e+02, 2.864501342773438e+02, 2.748500061035156e+02, 2.840024108886719e+02, 2.7540380859375e+02, 2.703080139160156e+02, 2.659500122070312e+02, 2.618322143554688e+02, 2.719844970703125e+02, 2.773252563476562e+02, 2.656997680664062e+02, 2.725499572753906e+02, 2.664148559570312e+02, 2.676314697265625e+02, 2.699958190917969e+02, 2.683116455078125e+02, 2.675001831054688e+02]
+time=[0e+00, 3.1536e+07]
+senMasFra.X=[9.999999776482582e-03, 3.122321562841535e-03, 3.440444706939161e-04, 3.512010676786304e-03, 2.463767305016518e-03, 3.357782494276762e-03, 2.008456271141768e-03, 8.566559990867972e-04, 6.286120624281466e-04, 2.316790167242289e-03, 7.602155674248934e-04, 2.588261850178242e-03, 2.249995013698936e-03, 1.959060085937381e-03, 1.352632069028914e-03, 2.971002366393805e-03, 2.320040948688984e-03, 3.376219188794494e-03, 4.214721731841564e-03, 5.77204767614603e-03, 2.396879019215703e-03, 2.10105930455029e-03, 2.557935658842325e-03, 3.471726318821311e-03, 5.140878260135651e-03, 4.624447785317898e-03, 2.612452721223235e-03, 5.075269378721714e-03, 5.906902719289064e-03, 1.082433573901653e-02, 3.256241092458367e-03, 5.586483050137758e-03, 6.718110758811235e-03, 7.119864691048861e-03, 4.839681088924408e-03, 3.090067068114877e-03, 5.29335904866457e-03, 4.80494974181056e-03, 7.916498929262161e-03, 7.377533707767725e-03, 4.066736437380314e-03, 1.339246053248644e-02, 8.334294892847538e-03, 1.098270621150732e-02, 8.108842186629772e-03, 1.092413067817688e-02, 7.655843626707792e-03, 9.597386233508587e-03, 3.741799155250192e-03, 1.08664482831955e-02, 1.063928194344044e-02, 1.31863197311759e-02, 7.559601217508316e-03, 1.301905419677496e-02, 1.773533597588539e-02, 1.061238814145327e-02, 1.530792471021414e-02, 1.274930965155363e-02, 1.501031219959259e-02, 1.898554712533951e-02, 7.29611748829484e-03, 1.192073337733746e-02, 1.301258616149426e-02, 9.803350083529949e-03, 1.684053987264633e-02, 1.093711610883474e-02, 1.037030667066574e-02, 8.504835888743401e-03, 1.057502720504999e-02, 9.490564465522766e-03, 8.473607711493969e-03, 1.297081541270018e-02, 8.160363882780075e-03, 8.166203275322914e-03, 8.512622676789761e-03, 6.519931834191084e-03, 6.301441229879856e-03, 4.451035056263208e-03, 6.538196001201868e-03, 5.301995202898979e-03, 4.581396002322435e-03, 4.089135210961103e-03, 4.15601022541523e-03, 5.062866024672985e-03, 1.138131972402334e-02, 9.055973030626774e-03, 2.9555584769696e-03, 3.844365011900663e-03, 2.814401872456074e-03, 1.774934236891568e-03, 1.572485896758735e-03, 1.22644635848701e-03, 2.579494612291455e-03, 3.334034932777286e-03, 1.538565498776734e-03, 2.934452844783664e-03, 1.453853212296963e-03, 2.023447304964066e-03, 1.696712686680257e-03, 2.373151713982224e-03, 1.716235186904669e-03]
+senRelHum.phi=[5e-01, 9.042377471923828e-01, 6.391895413398743e-01, 8.199999928474426e-01, 5.620055794715881e-01, 7.900075912475586e-01, 8.226159811019897e-01, 5.661154985427856e-01, 7.599999904632568e-01, 7.634303569793701e-01, 5.800138711929321e-01, 8.040750026702881e-01, 6.447941660881042e-01, 5.717806816101074e-01, 7.877496480941772e-01, 7.300016283988953e-01, 7.157644033432007e-01, 8.899999856948853e-01, 7.525689601898193e-01, 9.148651361465454e-01, 6.699926257133484e-01, 3.340027630329132e-01, 6.624066233634949e-01, 8.820917010307312e-01, 5.760959982872009e-01, 9.699986577033997e-01, 6.884852051734924e-01, 7.729530930519104e-01, 9.890000224113464e-01, 5.338967442512512e-01, 5.000041127204895e-01, 7.685593962669373e-01, 9.890000224113464e-01, 6.56241238117218e-01, 4.407639801502228e-01, 3.799961805343628e-01, 5.115852952003479e-01, 8.327927589416504e-01, 6.219888925552368e-01, 4.900138974189758e-01, 5.599914789199829e-01, 5.407581925392151e-01, 6.443113088607788e-01, 5.02113938331604e-01, 7.32917845249176e-01, 8.400148749351501e-01, 6.99999988079071e-01, 3.537026345729828e-01, 6.233835220336914e-01, 6.230841875076294e-01, 6.200146675109863e-01, 7.778878808021545e-01, 5.318230390548706e-01, 5.904666781425476e-01, 9.146806597709656e-01, 4.89987850189209e-01, 6.580055356025696e-01, 9.431781768798828e-01, 6.78256094455719e-01, 9.600969552993774e-01, 7.999980449676514e-01, 6.547479033470154e-01, 9.198354482650757e-01, 8.490427732467651e-01, 7.45474636554718e-01, 8.100115060806274e-01, 6.982327103614807e-01, 5.691961050033569e-01, 8.34676206111908e-01, 6.814187169075012e-01, 7.500263452529907e-01, 9.300000071525574e-01, 9.098290205001831e-01, 5.856058597564697e-01, 8.519916534423828e-01, 6.199765205383301e-01, 5.729219317436218e-01, 7.560104131698608e-01, 7.603222131729126e-01, 8.711155652999878e-01, 7.899883389472961e-01, 5.697740316390991e-01, 7.881024479866028e-01, 7.852515578269958e-01, 7.687603831291199e-01, 9.599936008453369e-01, 6.955474019050598e-01, 4.803870320320129e-01, 6.366337537765503e-01, 5.987301468849182e-01, 7.700142860412598e-01, 8.639707565307617e-01, 7.559916377067566e-01, 6.579852700233459e-01, 7.699999809265137e-01, 8.200017809867859e-01, 6.838138103485107e-01, 8.566915988922119e-01, 5.876175165176392e-01, 9.47726309299469e-01, 7.350124716758728e-01]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sources_Examples_Outside_CpLowRise.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sources_Examples_Outside_CpLowRise.txt
new file mode 100644
index 00000000..f60fcb19
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sources_Examples_Outside_CpLowRise.txt
@@ -0,0 +1,13 @@
+last-generated=2016-12-15
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": "1",
+ "linear": "0, 0, 0, 0"
+}
+weaDat.weaBus.winDir=[4.88692188262939453125, 4.88692188262939453125, 4.68504476547241210938, 4.89390325546264648438, 5.1871185302734375, 5.06145477294921875, 4.88692188262939453125, 4.88692188262939453125, 4.88692188262939453125, 4.7123889923095703125, 4.7123889923095703125, 4.88692188262939453125, 4.87682390213012695312, 4.70066022872924804688, 4.87472391128540039062, 5.09636163711547851562, 5.23414468765258789062, 5.22536516189575195312, 4.8039951324462890625, 4.53785610198974609375, 4.53785610198974609375, 4.72012996673583984375, 4.88624048233032226562, 4.88692188262939453125, 4.88692188262939453125, 4.7123889923095703125, 4.7123889923095703125, 4.93646335601806640625, 4.16658926010131835938, 3.06995868682861328125, 4.0170497894287109375, 5.26391315460205078125, 5.8503437042236328125, 0.1485678553581237793, 0.55193388462066650391, 0.23144988715648651123, 5.59714603424072265625, 5.23598766326904296875, 5.23598766326904296875, 5.328487396240234375, 5.4105205535888671875, 5.4105205535888671875, 5.4105205535888671875, 5.4105205535888671875, 5.24506902694702148438, 5.127079010009765625, 5.10094118118286132812, 5.22329854965209960938, 5.80845594406127929688, 6.28218507766723632812, 5.759586334228515625, 5.46637105941772460938, 5.34608030319213867188, 5.23598766326904296875, 5.23598766326904296875, 5.23598766326904296875, 5.23598766326904296875, 5.23598766326904296875, 5.23598766326904296875, 5.23598766326904296875, 5.23598766326904296875, 5.40093660354614257812, 5.61297893524169921875, 5.92589807510375976562, 5.66882944107055664062, 5.39935064315795898438, 5.4105205535888671875, 5.4105205535888671875, 5.4105205535888671875, 5.4105205535888671875, 5.23598766326904296875, 5.23598766326904296875, 5.23598766326904296875, 5.34608030319213867188, 5.45953512191772460938, 5.58505344390869140625, 6.14096879959106445312, 0.43673798441886901855, 0.21347002685070037842, 5.35152482986450195312, 5.4063320159912109375, 5.5914764404296875, 5.43203449249267578125, 5.4105205535888671875, 5.4105205535888671875, 5.4105205535888671875, 5.4105205535888671875, 5.40136098861694335938, 5.29228496551513671875, 4.44011783599853515625, 3.48926234245300292969, 1.69646000862121582031, 0.16550040245056152344, 6.21532678604125976562, 5.77354907989501953125, 5.48033380508422851562, 5.45657491683959960938, 5.58505344390869140625, 5.58505344390869140625, 5.54895162582397460938, 5.4105205535888671875]
+time=[17280000., 17884800.]
+east.pWin=[-5.22993707656860351562, -5.47164440155029296875, -6.88283824920654296875, -4.9394683837890625, -4.93624114990234375, -4.74335479736328125, -4.35929250717163085938, -6.0089015960693359375, -8.3099212646484375, -16.87041473388671875, -17.2262592315673828125, -8.48183155059814453125, -7.80004024505615234375, -11.42652034759521484375, -5.013946533203125, -2.50969696044921875, -1.40911030769348144531, -1.51641702651977539062, -5.6349201202392578125, -6.67582559585571289062, -5.1471576690673828125, -7.21078538894653320312, -5.66297817230224609375, -5.66255712509155273438, -5.48309278488159179688, -5.86984395980834960938, -4.49032831192016601562, -2.30872178077697753906, -1.17479646205902099609, -0.69056713581085205078, -0.4354407191276550293, -0.61371874809265136719, -0.35165989398956298828, -0.01721351593732833862, 0.48979482054710388184, -1.64643394947052001953, -4.36774778366088867188, -4.05654144287109375, -6.91693592071533203125, -4.94661712646484375, -3.31822061538696289062, -2.06301379203796386719, -1.49915921688079833984, -2.529567718505859375, -2.10010218620300292969, -1.38594210147857666016, -1.11202776432037353516, -0.89084291458129882812, -4.40297460556030273438, -6.54150676727294921875, -12.16670703887939453125, -7.94996166229248046875, -7.0316925048828125, -7.56998586654663085938, -8.16909027099609375, -5.08413457870483398438, -2.50875425338745117188, -2.19409132003784179688, -1.96352648735046386719, -1.97535920143127441406, -1.53214442729949951172, -0.86888444423675537109, -2.79072880744934082031, -9.3378353118896484375, -8.76643466949462890625, -5.04835557937622070312, -8.60916805267333984375, -10.75562286376953125, -7.55342340469360351562, -5.33624505996704101562, -3.30712461471557617188, -2.7985363006591796875, -2.53203678131103515625, -2.28732800483703613281, -2.40244174003601074219, -1.96005928516387939453, -2.25812625885009765625, 0.40445813536643981934, -2.84588766098022460938, -3.41911530494689941406, -6.19816064834594726562, -16.02433013916015625, -10.35717487335205078125, -9.21845149993896484375, -4.54227972030639648438, -2.46860623359680175781, -1.54126274585723876953, -1.36409616470336914062, -1.20530259609222412109, -0.50164192914962768555, -0.34187650680541992188, 2.40034317970275878906, -2.57400345802307128906, -5.56036520004272460938, -10.4556522369384765625, -11.1172351837158203125, -10.63004016876220703125, -14.00925731658935546875, -9.8594818115234375, -5.61305522918701171875, -2.17362999916076660156]
+north.pWin=[-2.87492609024047851562, -3.0077972412109375, -8.38273906707763671875, -2.58411693572998046875, 3.21388483047485351562, 0.44489276409149169922, -2.39631867408752441406, -3.30313873291015625, -4.568073272705078125, -17.9493160247802734375, -18.327911376953125, -4.66257810592651367188, -4.58681392669677734375, -12.81853008270263671875, -2.98829317092895507812, 0.58058798313140869141, 1.26973438262939453125, 1.29450058937072753906, -4.77795648574829101562, -17.4808750152587890625, -13.478336334228515625, -7.4143218994140625, -3.12764596939086914062, -3.11274576187133789062, -3.01409053802490234375, -6.24527692794799804688, -4.77753210067749023438, -0.83734267950057983398, -3.64416480064392089844, -0.27287998795509338379, -1.19148135185241699219, 0.65076708793640136719, 0.34044036269187927246, 0.03114243783056735992, 1.26655399799346923828, 4.49153852462768554688, 5.19312524795532226562, 3.69589686393737792969, 6.30233001708984375, 6.72050380706787109375, 5.05956363677978515625, 3.14554858207702636719, 2.2857875823974609375, 3.856964111328125, 2.01622080802917480469, 0.50225967168807983398, 0.27824565768241882324, 0.75053578615188598633, 4.21278905868530273438, 8.43467998504638671875, 11.74281024932861328125, 11.8008289337158203125, 9.972248077392578125, 6.89743804931640625, 7.44339990615844726562, 4.63222265243530273438, 2.285648345947265625, 1.99895679950714111328, 1.78888976573944091797, 1.79967045783996582031, 1.39586353302001953125, 1.32085251808166503906, 3.22157883644104003906, 9.519084930419921875, 9.2287139892578125, 7.66950941085815429688, 13.12883663177490234375, 16.4030208587646484375, 11.5185413360595703125, 8.13702106475830078125, 3.01306414604187011719, 2.54967355728149414062, 2.30686116218566894531, 3.24348926544189453125, 3.5900440216064453125, 2.38464617729187011719, 2.6587066650390625, 3.27780270576477050781, 6.9595661163330078125, 4.90300703048706054688, 9.44218730926513671875, 19.2634868621826171875, 15.762699127197265625, 14.05819797515869140625, 6.92619848251342773438, 3.76400709152221679688, 2.34998607635498046875, 2.0740680694580078125, 1.45038020610809326172, -1.51131498813629150391, -0.12222798168659210205, -1.49689114093780517578, 4.97858762741088867188, 6.7909870147705078125, 10.03937053680419921875, 16.2357387542724609375, 15.9307384490966796875, 17.048427581787109375, 11.99730968475341796875, 7.31897306442260742188, 3.31421780586242675781]
+south.pWin=[-13.6950836181640625, -14.32796192169189453125, -6.57735109329223632812, -13.16025447845458984375, -15.137126922607421875, -14.494235992431640625, -11.41537761688232421875, -15.73468017578125, -21.7592411041259765625, -17.9493160247802734375, -18.327911376953125, -22.2093219757080078125, -19.8717212677001953125, -11.551849365234375, -12.69698429107666015625, -7.6571712493896484375, -4.35857295989990234375, -4.68344736099243164062, -10.75613307952880859375, -3.66976284980773925781, -2.82942080497741699219, -7.94139337539672851562, -14.8028564453125, -14.82783794403076171875, -14.35793781280517578125, -6.24527692794799804688, -4.77753210067749023438, -6.6550235748291015625, 1.21026122570037841797, 1.0015735626220703125, 0.66350227594375610352, -1.90424823760986328125, -0.15781156718730926514, -0.00854532420635223389, -0.94394659996032714844, -1.27505981922149658203, -6.06103038787841796875, -12.5504245758056640625, -21.3988590240478515625, -15.07362461090087890625, -9.02550983428955078125, -5.61148595809936523438, -4.077816009521484375, -6.8804779052734375, -6.50608301162719726562, -4.22606372833251953125, -3.3922748565673828125, -2.75037312507629394531, -2.3047466278076171875, -2.28788876533508300781, -7.82563066482543945312, -18.6380023956298828125, -21.121036529541015625, -23.41887664794921875, -25.271984100341796875, -15.72933483123779296875, -7.76201629638671875, -6.78850221633911132812, -6.075164794921875, -6.11177396774291992188, -4.74050807952880859375, -2.41045832633972167969, -3.59602046012878417969, -3.40359354019165039062, -8.63895416259765625, -14.0474643707275390625, -23.4147014617919921875, -29.2514362335205078125, -20.543720245361328125, -14.51400852203369140625, -10.231983184814453125, -8.65854167938232421875, -7.8340473175048828125, -6.8710727691650390625, -5.75308942794799804688, -2.87555170059204101562, -0.72891819477081298828, -1.54234635829925537109, -1.95068824291229248047, -10.21464633941650390625, -17.0074443817138671875, -22.8257617950439453125, -26.780574798583984375, -25.071537017822265625, -12.35467433929443359375, -6.71466779708862304688, -4.19233751296997070312, -3.78108191490173339844, -3.73099374771118164062, -0.09359255433082580566, 0.35127019882202148438, -0.49132102727890014648, -1.37001717090606689453, -1.84909582138061523438, -6.3254337310791015625, -24.9019184112548828125, -25.680469512939453125, -20.551471710205078125, -14.4640598297119140625, -9.657909393310546875, -5.91235494613647460938]
+west.pWin=[19.21666717529296875, 20.105010986328125, 19.308391571044921875, 18.1657657623291015625, 16.3627262115478515625, 16.2595005035400390625, 16.016963958740234375, 22.079654693603515625, 30.53797149658203125, 46.4726715087890625, 47.453533172607421875, 31.1699695587158203125, 28.591464996337890625, 31.53079986572265625, 18.363494873046875, 8.489837646484375, 4.58927869796752929688, 4.96100568771362304688, 19.3034725189208984375, 24.531017303466796875, 18.912433624267578125, 19.8686923980712890625, 20.8056392669677734375, 20.8066844940185546875, 20.14708709716796875, 16.1629772186279296875, 12.36376476287841796875, 8.43502521514892578125, 3.76334142684936523438, -0.82220542430877685547, 0.99464011192321777344, 1.95609700679779052734, 0.03894525393843650818, -0.02652209624648094177, -1.29004359245300292969, -3.98901700973510742188, 3.74962115287780761719, 13.19937229156494140625, 22.5093669891357421875, 14.335758209228515625, 7.4980144500732421875, 4.66149950027465820312, 3.38737559318542480469, 5.71579074859619140625, 6.79444408416748046875, 4.65016508102416992188, 3.7563018798828125, 2.9171295166015625, 0.88689404726028442383, -6.52653646469116210938, 3.77873587608337402344, 14.01052379608154296875, 19.569248199462890625, 24.635223388671875, 26.5855770111083984375, 16.5437183380126953125, 8.1625766754150390625, 7.138683319091796875, 6.38845682144165039062, 6.42695856094360351562, 4.98483800888061523438, 2.03670835494995117188, 2.18438220024108886719, -0.6009203791618347168, 4.93092060089111328125, 11.905216217041015625, 19.4570102691650390625, 24.309749603271484375, 17.0704135894775390625, 12.0588245391845703125, 10.76054477691650390625, 9.10553264617919921875, 8.23833751678466796875, 6.36452198028564453125, 4.37634325027465820312, 1.80491077899932861328, -1.50395500659942626953, -3.39151072502136230469, -6.11418485641479492188, 9.382152557373046875, 14.23714733123779296875, 14.22039127349853515625, 21.4103755950927734375, 20.8344211578369140625, 10.264362335205078125, 5.5780315399169921875, 3.48251390457153320312, 3.19249176979064941406, 3.71934866905212402344, 1.79087245464324951172, -0.03026124835014343262, -0.67128831148147583008, -4.27053546905517578125, -4.71803760528564453125, 2.91134905815124511719, 18.2711467742919921875, 19.644947052001953125, 12.90330219268798828125, 9.080413818359375, 6.35764408111572265625, 4.91146039962768554688]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sources_Examples_TraceSubstancesFlowSource.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sources_Examples_TraceSubstancesFlowSource.txt
deleted file mode 100644
index 7003c28d..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Sources_Examples_TraceSubstancesFlowSource.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-last-generated=2015-08-05
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 1, 1, 1, 1, 1, 1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "0, 0, 0, 0, 0, 0, 0",
- "number of continuous time states": "20",
- "linear": " "
-}
-vol4.C[1]=[0., 0.00761703867465257645, 0.00695212231948971748, 0.00634439336135983467, 0.00578974280506372452, 0.00528357038274407387, 0.00482168281450867653, 0.00440051406621932897, 0.00401661312207579613, 0.0036664202343672514, 0.00334681151434779167, 0.00305502628907561302, 0.00278878048993647099, 0.00254563777707517147, 0.0023236854467540975, 0.00212112022563815117, 0.00193613744340837002, 0.0017672656103968616, 0.00161307677626609802, 0.00147231889422982931, 0.00134377588983625174, 0.00122638908214867115, 0.00111919711343944073, 0.00102133420296013355, 0.00093205523444339633, 0.00085062853759154677, 0.00077624921686947346, 0.0007083896198309958, 0.00064648478291928736, 0.00058995652943849564, 0.00053839257452636957, 0.00049136322923004627, 0.00044840699410997331, 0.00040921964682638645, 0.00037347601028159244, 0.00034082465572282672, 0.00031103694345802069, 0.00028386822668835521, 0.00025904687936417758, 0.00023640289145987481, 0.00021575202117674053, 0.00019688458996824928, 0.000179672846570611, 0.00016398046864196658, 0.00014965450100135058, 0.00013658693933393806, 0.00012466814951039851, 0.00011379639181541279, 0.00010387589281890541, 0.00009482017776463181, 0.00008656960562802851, 0.00007905069651314989, 0.00007220355473691598, 0.00006597449100809172, 0.00006031541124684736, 0.00005516691453522071, 0.00005041509575676169, 0.00004605913272826005, 0.00004205876393825747, 0.00003837830809061415, 0.00003498668229440227, 0.00003186050162184983, 0.00002899679020629264, 0.00002637084799061995, 0.0000239736709772842, 0.00002180121555284131, 0.00001985440030694008, 0.00001804406019800808, 0.00001636944944038986, 0.00001484876156609972, 0.00001347841498500202, 0.00001225754749611951, 0.00001116473413276253, 0.00001013928249449236, 0.00000921102855500067, 0.00000837315747048706, 0.00000761990804676316, 0.00000694657046551583, 0.00000632879482509452, 0.00000576687762077199, 0.00000525723271493916, 0.00000479463687952375, 0.0000043744703361881, 0.00000399181180910091, 0.00000364193897439691, 0.0000033224685012101, 0.00000303074307339557, 0.00000276466380455531, 0.0000025226781872334, 0.00000229307715926552, 0.00000207918969863385, 0.00000187926843864261, 0.00000169193026522407, 0.00000151615563481755, 0.00000135128868805623, 0.00000119703724976716, 0.00000105347271528444, 0.00000092103056203996, 0.00000080050961059897, 0.00000069458997131733, 0.0000006158581982163]
-C3.C=[0., 0.00034972908906638622, 0.00065914104925468564, 0.00092710222816094756, 0.00115714478306472301, 0.00135319912806153297, 0.00151881738565862179, 0.00165699166245758555, 0.00177060021087527275, 0.00186258880421519279, 0.00193552509881556034, 0.00199163984507322311, 0.00203274027444422245, 0.00206077005714178085, 0.00207720533944666386, 0.00208342703990638256, 0.00208081654272973537, 0.00207046233117580414, 0.00205341656692326069, 0.002030577277764678, 0.00200281664729118347, 0.00197086879052221775, 0.0019353857496753335, 0.00189693784341216087, 0.00185599213000386953, 0.0018130098469555378, 0.00176852615550160408, 0.00172282883431762457, 0.001676246174611151, 0.00162912486121058464, 0.00158166675828397274, 0.00153409515041857958, 0.00148666778113692999, 0.00143950642086565495, 0.00139275647234171607, 0.00134659151080995798, 0.00130108126904815435, 0.00125631422270089388, 0.00121240608859807253, 0.00116938876453787088, 0.0011273104464635253, 0.00108624459244310878, 0.00104619853664189577, 0.00100719067268073559, 0.00096925633260980248, 0.00093239673878997564, 0.0008966176537796855, 0.00086192064918577671, 0.00082830619066953659, 0.00079576950520277023, 0.00076428573811426759, 0.00073384499410167336, 0.0007044284138828516, 0.00067601463524624705, 0.00064858008408918977, 0.00062211242038756609, 0.00059664552100002744, 0.00057212577667087338, 0.0005485332221724093, 0.00052584661170840263, 0.00050404365174472332, 0.00048309593694284558, 0.00046294974163174629, 0.00044359028106555343, 0.00042498460970818996, 0.00040709797758609056, 0.00038989388849586248, 0.00037339533446356654, 0.00035756966099143012, 0.00034237344516441242, 0.00032777871820144355, 0.00031375719117932022, 0.00030029407935217023, 0.00028739951085299253, 0.00027503061573952436, 0.00026316780713386834, 0.00025179213844239712, 0.00024088525970000774, 0.00023043285182211548, 0.00022041745251044631, 0.00021082306921016425, 0.00020163474255241446, 0.00019283829897176482, 0.00018441611609887332, 0.00017634949472267181, 0.00016862835036590695, 0.00016123930981848389, 0.00015416955284308642, 0.00014740675396751612, 0.00014093182107899338, 0.0001347360375802964, 0.00012880738358944654, 0.00012313421757426113, 0.00011770529090426862, 0.00011250974057475105, 0.00010753710375865921, 0.00010277728870278224, 0.00009822062565945089, 0.00009385779412696138, 0.00008968161273514852, 0.00008569608326070011]
-C.C=[0., 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409]
-time=[0., 600.]
-C2.C=[0., 0.00034972908906638622, 0.00065914104925468564, 0.00092710222816094756, 0.00115714478306472301, 0.00135319912806153297, 0.00151881738565862179, 0.00165699166245758555, 0.00177060021087527275, 0.00186258880421519279, 0.00193552509881556034, 0.00199163984507322311, 0.00203274027444422245, 0.00206077005714178085, 0.00207720533944666386, 0.00208342703990638256, 0.00208081654272973537, 0.00207046233117580414, 0.00205341656692326069, 0.002030577277764678, 0.00200281664729118347, 0.00197086879052221775, 0.0019353857496753335, 0.00189693784341216087, 0.00185599213000386953, 0.0018130098469555378, 0.00176852615550160408, 0.00172282883431762457, 0.001676246174611151, 0.00162912486121058464, 0.00158166675828397274, 0.00153409515041857958, 0.00148666778113692999, 0.00143950642086565495, 0.00139275647234171607, 0.00134659151080995798, 0.00130108126904815435, 0.00125631422270089388, 0.00121240608859807253, 0.00116938876453787088, 0.0011273104464635253, 0.00108624459244310878, 0.00104619853664189577, 0.00100719067268073559, 0.00096925633260980248, 0.00093239673878997564, 0.0008966176537796855, 0.00086192064918577671, 0.00082830619066953659, 0.00079576950520277023, 0.00076428573811426759, 0.00073384499410167336, 0.0007044284138828516, 0.00067601463524624705, 0.00064858008408918977, 0.00062211242038756609, 0.00059664552100002744, 0.00057212577667087338, 0.0005485332221724093, 0.00052584661170840263, 0.00050404365174472332, 0.00048309593694284558, 0.00046294974163174629, 0.00044359028106555343, 0.00042498460970818996, 0.00040709797758609056, 0.00038989388849586248, 0.00037339533446356654, 0.00035756966099143012, 0.00034237344516441242, 0.00032777871820144355, 0.00031375719117932022, 0.00030029407935217023, 0.00028739951085299253, 0.00027503061573952436, 0.00026316780713386834, 0.00025179213844239712, 0.00024088525970000774, 0.00023043285182211548, 0.00022041745251044631, 0.00021082306921016425, 0.00020163474255241446, 0.00019283829897176482, 0.00018441611609887332, 0.00017634949472267181, 0.00016862835036590695, 0.00016123930981848389, 0.00015416955284308642, 0.00014740675396751612, 0.00014093182107899338, 0.0001347360375802964, 0.00012880738358944654, 0.00012313421757426113, 0.00011770529090426862, 0.00011250974057475105, 0.00010753710375865921, 0.00010277728870278224, 0.00009822062565945089, 0.00009385779412696138, 0.00008968161273514852, 0.00008569608326070011]
-C1.C=[0., 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409, 0.00829552765935659409]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Storage_Examples_ExpansionVessel.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Storage_Examples_ExpansionVessel.txt
deleted file mode 100644
index fe1d5a4b..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Fluid_Storage_Examples_ExpansionVessel.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-last-generated=2017-03-31
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "3",
- "linear": " "
-}
-vol.T=[2.931499938964844e+02, 2.963247375488281e+02, 2.989954833984375e+02, 3.012422790527344e+02, 3.031324768066406e+02, 3.047226257324219e+02, 3.060603332519531e+02, 3.071857299804688e+02, 3.081324462890625e+02, 3.089288940429688e+02, 3.095989379882812e+02, 3.1016259765625e+02, 3.106367797851562e+02, 3.110357055664062e+02, 3.113713073730469e+02, 3.116536560058594e+02, 3.118911743164062e+02, 3.120909729003906e+02, 3.122590942382812e+02, 3.124005126953125e+02, 3.125194702148438e+02, 3.126195678710938e+02, 3.127037658691406e+02, 3.127745971679688e+02, 3.128341674804688e+02, 3.128843078613281e+02, 3.097517395019531e+02, 3.071164855957031e+02, 3.048995056152344e+02, 3.030344543457031e+02, 3.014654235839844e+02, 3.001454467773438e+02, 2.990350341796875e+02, 2.981008605957031e+02, 2.973150024414062e+02, 2.966538696289062e+02, 2.960976867675781e+02, 2.956297912597656e+02, 2.952361755371094e+02, 2.94905029296875e+02, 2.9462646484375e+02, 2.9439208984375e+02, 2.941949462890625e+02, 2.94029052734375e+02, 2.938895263671875e+02, 2.937721557617188e+02, 2.936734008789062e+02, 2.935903015136719e+02, 2.935204162597656e+02, 2.934616088867188e+02, 2.934121704101562e+02, 2.965452880859375e+02, 2.991810302734375e+02, 3.013983764648438e+02, 3.032637939453125e+02, 3.048330993652344e+02, 3.061532897949219e+02, 3.07263916015625e+02, 3.081982421875e+02, 3.089842529296875e+02, 3.096454772949219e+02, 3.102017517089844e+02, 3.106697387695312e+02, 3.110634155273438e+02, 3.113946228027344e+02, 3.116732788085938e+02, 3.119076843261719e+02, 3.121048583984375e+02, 3.12270751953125e+02, 3.124103393554688e+02, 3.125277404785156e+02, 3.126264953613281e+02, 3.127095947265625e+02, 3.127795104980469e+02, 3.128383178710938e+02, 3.128877868652344e+02, 3.097546691894531e+02, 3.071189270019531e+02, 3.049015808105469e+02, 3.030361938476562e+02, 3.014668884277344e+02, 3.001466979980469e+02, 2.990360717773438e+02, 2.981017456054688e+02, 2.973157348632812e+02, 2.966545104980469e+02, 2.960982055664062e+02, 2.956302490234375e+02, 2.952365417480469e+02, 2.949053344726562e+02, 2.94626708984375e+02, 2.943923034667969e+02, 2.941951293945312e+02, 2.940292358398438e+02, 2.938896484375e+02, 2.937722473144531e+02, 2.936734924316406e+02, 2.935903930664062e+02, 2.935204772949219e+02, 2.93461669921875e+02, 2.934122009277344e+02]
-time=[0e+00, 7.2e+03]
-expVes.port_a.p=[3e+05, 3e+05]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_AirProperties.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_AirProperties.txt
deleted file mode 100644
index bf4563cd..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_AirProperties.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-last-generated=2016-09-09
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-p=[101325., 101325.]
-time=[0., 1.]
-X[1]=[0.00999999977648258209, 0.00999999977648258209]
-d=[1.20000004768371582031, 1.20000004768371582031]
-eta=[0.00001578539740876295, 0.00001582945151411215, 0.00001587350561946135, 0.00001591755972481055, 0.00001596161564914835, 0.00001600566974629231, 0.00001604972385984757, 0.00001609377795699072, 0.00001613783207054596, 0.00001618188797026645, 0.00001622594208382169, 0.00001626999619737693, 0.00001631405031093217, 0.00001635810442448741, 0.00001640215850521904, 0.00001644621440493899, 0.00001649026855131839, 0.00001653432263204947, 0.00001657837671278056, 0.00001662243085915995, 0.00001666648493989375, 0.00001671054090525387, 0.00001675459498599092, 0.00001679864906672201, 0.0000168427032131014, 0.00001688675729383249, 0.00001693081325919261, 0.00001697486727428406, 0.00001701892142066346, 0.00001706297556704285, 0.00001710702958212563, 0.00001715108372850719, 0.00001719513969386732, 0.0000172391937089566, 0.00001728324785533599, 0.00001732730200171539, 0.00001737135601679817, 0.00001741541198216697, 0.00001745946612854636, 0.00001750352027492575, 0.00001754757429000853, 0.00001759162843638793, 0.00001763568258276732, 0.0000176797384168395, 0.0000177237925632189, 0.00001776784670959829, 0.00001781190072468107, 0.00001785595487106046, 0.00001790000901743986, 0.00001794406485151204, 0.00001798811899789143, 0.0000180321731442702, 0.00001807622729064897, 0.00001812028143702774, 0.00001816433713980659, 0.00001820839128618536, 0.00001825244543256381, 0.0000182964995789429, 0.00001834055372532166, 0.00001838460787170043, 0.00001842866357447928, 0.00001847271772085805, 0.00001851677186723682, 0.00001856082601361559, 0.00001860488015999436, 0.00001864893430637312, 0.00001869299000915198, 0.00001873704415553074, 0.00001878109830190951, 0.0000188251524482886, 0.00001886920659466705, 0.00001891326256001571, 0.00001895731644382467, 0.00001900137059020344, 0.00001904542473658221, 0.00001908947888296098, 0.00001913353302933974, 0.00001917758899469057, 0.00001922164314108668, 0.00001926569702487613, 0.0000193097511712549, 0.00001935380531763336, 0.00001939785946401244, 0.00001944191542938061, 0.00001948596957575938, 0.00001953002345954883, 0.00001957407760592759, 0.0000196181317523107, 0.0000196621877176702, 0.0000197062418640533, 0.00001975029601043207, 0.00001979434989422152, 0.00001983840404060029, 0.00001988245818698556, 0.00001992651415234537, 0.000019970568298726, 0.00002001462244510477, 0.00002005867632889421, 0.00002010273047529033, 0.00002014678644064115, 0.00002019084058701992]
-h=[-5426.05517578125, -4512.96921787213796051219, -3599.88301582250960564124, -2686.79705791342712473124, -1773.71097793402691422671, -860.62506803019232393126, 52.4611209895128567382, 965.54696985818543453206, 1878.63321991278303357831, 2791.71866759630893284339, 3704.80479558049410115927, 4617.89116770530290523311, 5530.97729568948670930695, 6444.06342367367142287549, 7357.14887135719891375629, 8270.23480732051757513545, 9183.32161560681561240926, 10096.40706329034401278477, 11009.49251097386695619207, 11922.57931925871162093244, 12835.66476694223820231855, 13748.75157522707922908012, 14661.83702291060581046622, 15574.92247059413239185233, 16488.0102554414734186139, 17401.095703125, 18314.18251140984284575097, 19227.26659849205316277221, 20140.35340677689600852318, 21053.44021506173521629535, 21966.52430214394553331658, 22879.61111042878837906756, 23792.69791871363122481853, 24705.78200579584154183976, 25618.86881408068802556954, 26531.9556223655235953629, 27445.03970944773391238414, 28358.12651773257675813511, 29271.21332601742324186489, 30184.30013430226608761586, 31097.3842213844764046371, 32010.47102966931197443046, 32923.55979107915482018143, 33836.64387816136877518147, 34749.73068644620798295364, 35662.81749473105446668342, 36575.90158181326114572585, 37488.98839009810035349801, 38402.07519838294683722779, 39315.15928546515351627022, 40228.24609375, 41141.33290202186617534608, 42054.41971029373235069215, 42967.50651856560580199584, 43880.58788451330474345013, 44793.67469278517091879621, 45706.76150105054693995044, 46619.84830932889599353075, 47532.93511760076216887683, 48446.0219258726283442229, 49359.10329182032728567719, 50272.19010009220073698089, 51185.27690836406691232696, 52098.36371663593308767304, 53011.45052490779926301911, 53924.53733317967271432281, 54837.6186991273716557771, 55750.70550739923783112317, 56663.79231567110400646925, 57576.87912394945306004956, 58489.96593221482908120379, 59403.05274048669525654987, 60316.13410643439419800416, 61229.22091470626764930785, 62142.30772297813382465392, 63055.39453125, 63968.48133952186617534608, 64881.56814779373235069215, 65794.65886231559852603823, 66707.74022826329746749252, 67620.8270365351636428386, 68533.91384480055421590805, 69447.00065307889599353075, 70360.08746135076216887683, 71273.1742696226283442229, 72186.25563557032728567719, 73099.34244384219346102327, 74012.42925211405963636935, 74925.51606038594036363065, 75838.60286865780653897673, 76751.68967692967271432281, 77664.7710428773716557771, 78577.85785114923783112317, 79490.94465942110400646925, 80404.03146769944578409195, 81317.1182759648363571614, 82230.20508423670253250748, 83143.28645018440147396177, 84056.37325845626764930785, 84969.46006672813382465392, 85882.546875]
-hLiq=[-125520., -121754.39835333260998595506, -117988.79670666521997191012, -114223.20287249544344376773, -110457.60122582694748416543, -106692.00028055797156412154, -102926.39793249565991573036, -99160.79698722455941606313, -95395.2024516551464330405, -91629.602909175751847215, -87864.00056111489539034665, -84098.3982130540389334783, -80332.79586499319702852517, -76567.20132941371412016451, -72801.60178694594651460648, -69036.00224445958156138659, -65270.39709082425542874262, -61504.80145459136110730469, -57739.201912115458981134, -53973.60066471151367295533, -50208.00112223560427082703, -46442.39596859447192400694, -42676.80033235575683647767, -38911.20078987984743434936, -35145.59954247590940212831, -31380., -27614.39679947105469182134, -23848.80482128770381677896, -20083.19966764423224958591, -16317.59646712345602281857, -12552.00448893661268812139, -8786.40128841115802060813, -5020.79711132727879885351, -1255.2048890013384152553, 2510.39855566321330115898, 6276.00224446829633961897, 10041.59422265805005736183, 13807.19839973785565234721, 17572.80257682231604121625, 21338.40577734195176162757, 25103.9977555346158624161, 28869.60095605771857663058, 32635.20415658666752278805, 36400.798087884541018866, 40166.39933528848632704467, 43932.00448894243163522333, 47697.59842024030513130128, 51463.19966764423588756472, 55228.80482129818119574338, 58994.39484636468114331365, 62760., 66525.60515358181146439165, 70291.2103071636229287833, 74056.80764835717855021358, 77822.39035756594967097044, 81587.99551114776113536209, 85353.60066469349840190262, 89119.2058183113404083997, 92884.80315945832990109921, 96650.40831307739426847547, 100415.99102229547861497849, 104181.59617582141072489321, 107947.20132944047509226948, 111712.79867055952490773052, 115478.40382417858927510679, 119244.00897770452138502151, 123009.59168692260573152453, 126775.19684054167009890079, 130540.7941816886595916003, 134306.40714778786059468985, 138072.00448889881954528391, 141837.60183001786936074495, 145603.19235164282144978642, 149368.78969291088287718594, 153134.40265888095018453896, 156900., 160665.59734111904981546104, 164431.21030708911712281406, 168196.80764835717855021358, 171962.39816998213063925505, 175727.99551110118045471609, 179493.59285221213940531015, 183259.20581828340073116124, 187024.80315945832990109921, 190790.4161253725178539753, 194555.99102220233180560172, 198321.58836343316943384707, 202087.20132944046054035425, 205852.79867055953945964575, 209618.41163656683056615293, 213384.00897779766819439828, 217149.5838746274821460247, 220915.19684054167009890079, 224680.79418171659926883876, 228446.40714778786059468985, 232212.00448889881954528391, 235977.60183001786936074495, 239743.19235164282144978642, 243508.78969291088287718594, 247274.40265888095018453896, 251040.]
-u=[-89863.5546875, -88950.46872959093889221549, -88037.38277168187778443098, -87124.29681377288943622261, -86211.21085586377012077719, -85298.1250680301891406998, -84385.03894004564790520817, -83471.9531522121251327917, -82558.86702422784583177418, -81645.78157654432288836688, -80732.69544856013089884073, -79819.6093205759534612298, -78906.52319259176147170365, -77993.43706460758403409272, -77080.3516169240465387702, -76167.2661692405235953629, -75254.17936095567711163312, -74341.09391327215416822582, -73428.00846558863122481853, -72514.92165730378474108875, -71601.83620962026179768145, -70688.74940133541531395167, -69775.66395365189237054437, -68862.57850596836942713708, -67949.4916976835229434073, -67036.40625, -66123.31944171515351627022, -65210.23535463294683722779, -64297.14854634810035349801, -63384.06173806326114572585, -62470.97765098105446668342, -61557.89084269620798295364, -60644.80403441136877518147, -59731.71994732915482018143, -58818.63313904431561240926, -57905.5463307594764046371, -56992.46224367726244963706, -56079.37152914242324186489, -55166.28472085757675813511, -54253.19791257273755036294, -53340.1138254905235953629, -52427.02701720568438759074, -51513.94020892084517981857, -50600.85612183863122481853, -49687.76931355379201704636, -48774.68250526894553331658, -47861.59841818673885427415, -46948.51160990189964650199, -46035.42480161705316277221, -45122.34071453484648372978, -44209.25390625, -43296.16709797813382465392, -42383.08028970626764930785, -41469.99348143439419800416, -40556.91211548669525654987, -39643.82530721482908120379, -38730.73849894945306004956, -37817.65169067110400646925, -36904.56488239923783112317, -35991.4780741273716557771, -35078.39670817967271432281, -34165.30989990779926301911, -33252.22309163593308767304, -32339.13628336406691232696, -31426.04947509219709900208, -30512.962666820330923656, -29599.88130087263198220171, -28686.79449260076216887683, -27773.70768432889599353075, -26860.62087605055057792924, -25947.53406778517091879621, -25034.44725951330110547133, -24121.36589356560216401704, -23208.27908529373598867096, -22295.19227702186617534608, -21382.10546875, -20469.01866047813382465392, -19555.93185220626401132904, -18642.84504393439783598296, -17729.76367798669889452867, -16816.67686971482908120379, -15903.58908488694942207076, -14990.50227660860400646925, -14077.41546833673601213377, -13164.32866006486801779829, -12251.247294117169076344, -11338.16048584530108200852, -10425.07367757343308767304, -9511.98686930156691232696, -8598.90006102969891799148, -7685.8127644765800141613, -6772.73139852888198220171, -5859.64459025701398786623, -4946.55778198514599353075, -4033.47072956617512318189, -3120.38392130079500930151, -2207.29711302761779734283, -1294.21562501091625563276, -381.12875570389201129728, 531.95811360313211935136, 1445.0450439453125]
-s=[-94.3657989501953125, -90.61749259218562713158, -86.88298780949688193687, -83.16217779059819292797, -79.45496335335570847747, -75.76124600234000183718, -72.08092449529485179482, -68.41391002123755527009, -64.76010066641670448462, -61.11940513925183182664, -57.49172264672613152925, -53.87696816879290651059, -50.27504633819105350767, -46.68586560175190669497, -43.1093446952977714659, -39.54538557465891557285, -35.99389521692848603607, -32.45480028405616934606, -28.9280077375600654932, -25.41342842405480340062, -21.91098698902219155116, -18.42059097795944566656, -14.94216686829604157083, -11.47562743619570468923, -8.02088743274526905225, -4.577877044677734375, -1.14650626239008346374, 2.27328768531454183943, 5.6816035027827993531, 9.07850739127815309359, 12.46406533593515320035, 15.83837333445175232782, 19.20149471028357979208, 22.55349673946037469818, 25.89446902159481211925, 29.22447402683071970841, 32.54357817443684552927, 35.85186610032133813775, 39.14940037303177433614, 42.43625347203446551703, 45.71248050213294078503, 48.97817346789305759103, 52.23338743906879244605, 55.4781814284544125826, 58.71263962466154140429, 61.93682100538485713059, 65.15077704559641347259, 68.35459175082918648059, 71.54832037560515800578, 74.73202211408965922601, 77.90576934814453125, 81.06962123671105757694, 84.22363881702790422423, 87.36788312436046055609, 90.50238891235953531123, 93.62726220967785195626, 96.7425377103095485154, 99.84827644824937920021, 102.94453945965140917451, 106.03138015096337198884, 109.10884124346593182509, 112.17701282824198472099, 115.23592993966222763902, 118.2856536122280743939, 121.32623725186495278194, 124.35774189471133865936, 127.38018770049471584116, 130.39367173463097060448, 133.39823698933466289418, 136.39393687020680090427, 139.38081715287793826974, 142.35892361530682137527, 145.32828436145601358476, 148.2890110832604193547, 151.24113183151743555754, 154.1846771240234375, 157.11969273561771842651, 160.04625496191900424492, 162.96440957951278960536, 165.87416978883638307707, 168.77561605208785522336, 171.66879203560370115156, 174.55374351504875107821, 177.43051626758349925694, 180.29915606997766985842, 183.15969167414621665557, 186.01220295540028359937, 188.85670335711731127049, 191.69326917255136777385, 194.52191566070979433789, 197.34270385733094599345, 200.15564753807953479736, 202.96082601213407770047, 205.75826826503654842782, 208.54803533199935827724, 211.33014247111566419335, 214.10463546012158531084, 216.87155886479300193059, 219.63096092915097301557, 222.38288617238939082199, 225.127349853515625]
-g=[17518.98828125, 17602.23047056542418431491, 17682.10547223023604601622, 17758.62305187204765388742, 17831.80078761326149106026, 17901.64647927018813788891, 17968.17578990562469698489, 18031.39648253010454936884, 18091.32422911385219777003, 18147.9687302117636136245, 18201.34374224093335215002, 18251.4570341207945602946, 18298.32423080157968797721, 18341.95705112904033740051, 18382.3632789182047417853, 18419.55661922208673786372, 18453.54883959770813817158, 18484.34960409615814569406, 18511.97068427972408244386, 18536.42383350337695446797, 18557.71874403081528726034, 18575.86719816711411112919, 18590.87890781694659381174, 18602.76757368376274826005, 18611.53906620898487744853, 18617.208984375, 18619.78320381417870521545, 18619.27539248996981768869, 18615.69531307276338338852, 18609.05077418476867023855, 18599.35743487856598221697, 18586.61914395214262185618, 18570.85154992018578923307, 18552.06057310098913148977, 18530.25782072821675683372, 18505.45310914426590898074, 18477.65824458739734836854, 18446.87892149106482975185, 18413.12693618427510955371, 18376.41205431997877894901, 18336.74416497321362840012, 18294.13279663029607036151, 18248.5878285943872469943, 18200.11722300427209120244, 18148.7304560817101446446, 18094.43743320102294092067, 18037.24614244061012868769, 17977.16796138208883348852, 17914.21086810846099979244, 17848.38482949497119989246, 17779.697265625, 17708.15618015198924695142, 17633.77329238377205911092, 17556.55641487622779095545, 17476.51579917299750377424, 17393.65635011548147303984, 17307.98830194192487397231, 17219.52141990528616588563, 17128.26546990947826998308, 17034.22435838781530037522, 16937.41234283033554675058, 16837.832175276598718483, 16735.49614307201045448892, 16630.41010535874011111446, 16522.58382778973100357689, 16412.02512313040278968401, 16298.74346400499234732706, 16182.74433602015233191196, 16064.03719505056869820692, 15942.62985348011898167897, 15818.53012357859370240476, 15691.74679481448401929811, 15562.28748281040498113725, 15430.15845716687181266025, 15295.36927018374626641162, 15157.9267578125, 15017.83970864066395733971, 14875.11398257408473000396, 14729.75836870320199523121, 14581.78059321217006072402, 14431.18768076082960760687, 14277.98734146124479593709, 14122.18641088790900539607, 13963.79270181534957373515, 13802.81305033247735991608, 13639.25722833198415173683, 13473.12914536069547466468, 13304.4375809235771157546, 13133.18937073694360151421, 12959.39135076623279019259, 12783.05133376522644539364, 12604.17722957876867440064, 12422.77471849039829976391, 12238.84974164617779024411, 12052.4110880025018559536, 11863.46559328318289772142, 11672.01911724337878695223, 11478.0806358194568019826, 11281.65369684915640391409, 11082.74628438384752371348, 10881.3662109375]
-f=[-52701.74609375, -52878.42187899406417272985, -53058.46094563917722553015, -53241.85938743270526174456, -53428.59767312556505203247, -53618.66795449057826772332, -53812.05861995129816932604, -54008.75390034831798402593, -54208.74222361196007113904, -54412.01164559010067023337, -54618.55465652776911156252, -54828.35548137172008864582, -55041.40630766213871538639, -55257.6915103064602590166, -55477.19920558927697129548, -55699.92174148353660712019, -55925.84773772891639964655, -56154.96089630303322337568, -56387.25764543504192261025, -56622.72271283704321831465, -56861.34367850949638523161, -57103.10953475059795891866, -57348.01565441809361800551, -57596.04286474359832936898, -57847.18763572369061876088, -58101.43359375, -58358.77759092250926187262, -58619.19893804063030984253, -58882.69918719220004277304, -59149.2580364523601019755, -59418.86686465768434572965, -59691.51946595510526094586, -59967.207229733066924382, -60245.9136954385758144781, -60527.63271131666260771453, -60812.35173328092787414789, -61100.06599296713102376089, -61390.76157956412498606369, -61684.42982838088209973648, -61981.05902061152301030234, -62280.64435198240971658379, -62583.17198381783964578062, -62888.63321536604780703783, -63197.01930984247883316129, -63508.32429338603833457455, -63822.53553287608519895002, -64139.64035942226473707706, -64459.63285085411189356819, -64782.50816074641625164077, -65108.24968826834083301947, -65436.85546875, -65768.31281772462534718215, -66102.61001588810177054256, -66439.74315687862690538168, -66779.70239310459874104708, -67122.47615253874391783029, -67468.06241733474598731846, -67816.44556286321312654763, -68167.61777637460909318179, -68521.57124514789029490203, -68878.30383432982489466667, -69237.79635918640997260809, -69600.05451423968770541251, -69965.05486232491966802627, -70332.79740338622650597245, -70703.27432466286700218916, -71076.46776848644367419183, -71452.38218333706026896834, -71831.00754093093564733863, -72212.33602879873069468886, -72596.35202219303755555302, -72983.04770823089347686619, -73372.42075799060694407672, -73764.46800018625799566507, -74159.17149759722815360874, -74556.53125, -74956.53944545336707960814, -75359.18045847302710171789, -75764.45428894725046120584, -76172.34287251341447699815, -76582.85107193414296489209, -76995.9686512599146226421, -77411.687798446582746692, -77830.0007006779924267903, -78250.89173292914347257465, -78674.36617544888576958328, -79100.41345158136391546577, -79529.02323263112339191139, -79960.1877063217107206583, -80393.89906009723199531436, -80830.15729371554334647954, -81268.94415908583323471248, -81710.26488677172164898366, -82154.10124432833981700242, -82600.46104427750105969608, -83049.32084939836931880563, -83500.68847169759101234376, -83954.53776120362454093993, -84410.881940200793906115, -84869.70268650350044481456, -85331.]
-hIse=[-5426.05517578125, -4512.96921787213796051219, -3599.88301582250960564124, -2686.79705791342712473124, -1773.71097793402691422671, -860.62506803019232393126, 52.4611209895128567382, 965.54696985818543453206, 1878.63321991278303357831, 2791.71866759630893284339, 3704.80479558049410115927, 4617.89116770530290523311, 5530.97729568948670930695, 6444.06342367367142287549, 7357.14887135719891375629, 8270.23480732051757513545, 9183.32161560681561240926, 10096.40706329034401278477, 11009.49251097386695619207, 11922.57931925871162093244, 12835.66476694223820231855, 13748.75157522707922908012, 14661.83702291060581046622, 15574.92247059413239185233, 16488.0102554414734186139, 17401.095703125, 18314.18251140984284575097, 19227.26659849205316277221, 20140.35340677689600852318, 21053.44021506173521629535, 21966.52430214394553331658, 22879.61111042878837906756, 23792.69791871363122481853, 24705.78200579584154183976, 25618.86881408068802556954, 26531.9556223655235953629, 27445.03970944773391238414, 28358.12651773257675813511, 29271.21332601742324186489, 30184.30013430226608761586, 31097.3842213844764046371, 32010.47102966931197443046, 32923.55979107915482018143, 33836.64387816136877518147, 34749.73068644620798295364, 35662.81749473105446668342, 36575.90158181326114572585, 37488.98839009810035349801, 38402.07519838294683722779, 39315.15928546515351627022, 40228.24609375, 41141.33290202186617534608, 42054.41971029373235069215, 42967.50651856560580199584, 43880.58788451330474345013, 44793.67469278517091879621, 45706.76150105054693995044, 46619.84830932889599353075, 47532.93511760076216887683, 48446.0219258726283442229, 49359.10329182032728567719, 50272.19010009220073698089, 51185.27690836406691232696, 52098.36371663593308767304, 53011.45052490779926301911, 53924.53733317967271432281, 54837.6186991273716557771, 55750.70550739923783112317, 56663.79231567110400646925, 57576.87912394945306004956, 58489.96593221482908120379, 59403.05274048669525654987, 60316.13410643439419800416, 61229.22091470626764930785, 62142.30772297813382465392, 63055.39453125, 63968.48133952186617534608, 64881.56814779373235069215, 65794.65886231559852603823, 66707.74022826329746749252, 67620.8270365351636428386, 68533.91384480055421590805, 69447.00065307889599353075, 70360.08746135076216887683, 71273.1742696226283442229, 72186.25563557032728567719, 73099.34244384219346102327, 74012.42925211405963636935, 74925.51606038594036363065, 75838.60286865780653897673, 76751.68967692967271432281, 77664.7710428773716557771, 78577.85785114923783112317, 79490.94465942110400646925, 80404.03146769944578409195, 81317.1182759648363571614, 82230.20508423670253250748, 83143.28645018440147396177, 84056.37325845626764930785, 84969.46006672813382465392, 85882.546875]
-beta=[0., 0.]
-kappa=[-0.00000986923259915784, -0.00000986923259915784]
-ddpT=[0.00001184307893709047, 0.00001184307893709047]
-ddTp=[0., 0.]
-dddX[1]=[0., 0.]
-cp=[1014.53997802734375, 1014.53997802734375]
-cv=[725.74407958984375, 725.74407958984375]
-lambda=[0.02183416485786437988, 0.02190585993390485597, 0.02197747677884531736, 0.02204901166739670765, 0.02212047018749241367, 0.02219184860055531394, 0.02226314880909471827, 0.0223343707599881168, 0.02240551264365095788, 0.0224765743806248329, 0.02254755793944775849, 0.02261846326713944783, 0.02268929036369989397, 0.02276003736648395115, 0.02283070608552451725, 0.02290129471090027527, 0.02297180521027936476, 0.02304223551087405605, 0.02311258944309423427, 0.02318286152368328329, 0.02325305713112184314, 0.02332317274932240239, 0.02339320816933974576, 0.02346316722097813515, 0.02353304442038976069, 0.02360284514725208282, 0.02367256588427743905, 0.02374220631999228448, 0.0238117705947718146, 0.02388125477564450455, 0.02395065865591278209, 0.02401998451190227174, 0.02408923213662895677, 0.02415839946145400055, 0.02422748876128526935, 0.02429649982986706314, 0.02436543059923777094, 0.02443428334292192458, 0.02450305599270923354, 0.02457175041124484358, 0.02464036639417263586, 0.02470890248781060922, 0.02477736035018689165, 0.0248457379150340725, 0.02491403745252048635, 0.02498225875875076732, 0.02505039976814360872, 0.02511846274948291088, 0.02518644749955830167, 0.02525435195350680256, 0.02532217651605606079, 0.02538992470998448561, 0.02545759281001162486, 0.02552518081619076576, 0.0255926901889422867, 0.02566012173307100075, 0.02572747504596086324, 0.02579474826494817033, 0.02586194139004481876, 0.02592905814652381874, 0.02599609254718253035, 0.02606305097900813925, 0.02612992931695022614, 0.0261967294236406141, 0.02626344943643415739, 0.02633009121796711996, 0.02639665250915152958, 0.0264631359660288841, 0.02652954119166786584, 0.02659586632341935306, 0.02666211322391820113, 0.02672828189315916425, 0.02679437007482263905, 0.02686038041942353377, 0.02692631067012314292, 0.02699216268956661224, 0.02705793647775394523, 0.0271236301720577562, 0.02718924563509654904, 0.02725478247652695502, 0.02732023961493456124, 0.02738561665944041351, 0.02745091733532954714, 0.02751613791731470984, 0.02758127840544743678, 0.02764634027475394717, 0.02771132430083846424, 0.02777622823304390018, 0.02784105393399319631, 0.02790580140368635609, 0.02797046877950043475, 0.0280350575393104387, 0.02809956659047112629, 0.02816399741037567753, 0.02822834999902454692, 0.0282926224937712148, 0.02835681675728218831, 0.02842093240761788681, 0.02848496834645992959, 0.02854892419142732521, 0.02861280366778373718]
-pMed=[101325., 101325.]
-TMed=[243.149993896484375, 244.05000307187356156646, 244.94999698847709623806, 245.85000616386281535597, 246.75000008046299626585, 247.64999382943187811179, 248.55000317245227847707, 249.4499969214211319013, 250.3500062644413048929, 251.24999967814866863591, 252.14999376237966544068, 253.05000310539969632373, 253.94999718965115675928, 254.85000653265072401155, 255.74999994635811617627, 256.64999336006547991929, 257.5499881148746794679, 258.45001204607831368776, 259.35000545981296227183, 260.25000021456753529492, 261.14999362827495588135, 262.04998838312957332164, 262.95001231431501764746, 263.85000572802238139047, 264.75000048277701125699, 265.649993896484375, 266.54998865138446717538, 267.45001124131351843971, 268.35000599623185735254, 269.25000075098643037563, 270.14999282364658483857, 271.04998757840121470508, 271.95001285073391272817, 272.85000492339406719111, 273.74999967814869705762, 274.64999443290327008071, 275.54998650556342454365, 276.4500117778233629906, 277.35000653265075243326, 278.25000128740532545635, 279.14999336006547991929, 280.04998811487462262448, 280.95001338715280780889, 281.85000545981296227183, 282.75000021456753529492, 283.64999496932216516143, 284.54998704198231962437, 285.45001231431501764746, 286.35000706906964751397, 287.24999914172980197691, 288.149993896484375, 289.04998865137167740613, 289.95001392354612335112, 290.85000867828790660496, 291.74999806892077458542, 292.64999282366261468269, 293.54998757839797463021, 294.45001285072430619039, 295.35000760546614628765, 296.2500023602079295415, 297.14999175084079752196, 298.04998650558258077581, 298.95001177782978629693, 299.85000653264432912692, 300.75000128738616922419, 301.64999604212795247804, 302.5499854327608204585, 303.45001070482607019585, 304.35000545982256880961, 305.25000021457077536979, 306.14999496930613531731, 307.04998972437539350722, 307.95000963182241093818, 308.85000438700075164888, 309.74999914174259174615, 310.649993896484375, 311.54998865137167740613, 312.45001392354612335112, 313.35000867828790660496, 314.24999806892077458542, 315.14999282366261468269, 316.04998757839797463021, 316.95001285072430619039, 317.85000760546614628765, 318.7500023602079295415, 319.64999175084079752196, 320.54998650558258077581, 321.45001177782978629693, 322.35000653264432912692, 323.25000128738616922419, 324.14999604212795247804, 325.0499854327608204585, 325.95001070482607019585, 326.85000545982256880961, 327.75000021457077536979, 328.64999496930613531731, 329.54998972437539350722, 330.45000963182241093818, 331.35000438700075164888, 332.24999914174259174615, 333.149993896484375]
-MM=[0.02879012748599052429, 0.02879012748599052429]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_AirTestImplementation.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_AirTestImplementation.txt
deleted file mode 100644
index af7d25ec..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_AirTestImplementation.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-last-generated=2017-03-31
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "3",
- "linear": " "
-}
-volume.medium.T=[2.931499938964844e+02, 3.020360108860366e+02, 3.075538026891613e+02, 3.11571869131028e+02, 3.14839569358015e+02, 3.176753538023964e+02, 3.202217410454495e+02, 3.225477904603503e+02, 3.246896671131173e+02, 3.266691582493891e+02, 3.285018918250449e+02, 3.301999817861322e+02, 3.317738956669683e+02, 3.332330328913654e+02, 3.345859679393618e+02, 3.358402702709551e+02, 3.370031437078679e+02, 3.380812376059861e+02, 3.390807793358268e+02, 3.400074770177157e+02, 3.408666379352113e+02, 3.41663208506733e+02, 3.424016724473911e+02, 3.430863339514477e+02, 3.437210086260704e+02, 3.443094177246094e+02, 3.448548283778063e+02, 3.453604731066527e+02, 3.458291930610468e+02, 3.462637332564912e+02, 3.466665339579859e+02, 3.470399169058584e+02, 3.473860475997858e+02, 3.47706878253929e+02, 3.48004272357801e+02, 3.482799684186972e+02, 3.485355526238134e+02, 3.487724608279243e+02, 3.489920655297317e+02, 3.49195678989024e+02, 3.493843993049234e+02, 3.495593567492068e+02, 3.497215273026991e+02, 3.498718260676471e+02, 3.500111694653532e+02, 3.501403504887709e+02, 3.502600401863057e+02, 3.503709716923295e+02, 3.504738160233971e+02, 3.505691222264142e+02, 3.50657470703125e+02, 3.507393799573171e+02, 3.508153077557194e+02, 3.508857118624405e+02, 3.50950988633655e+02, 3.51011474539527e+02, 3.510675964225955e+02, 3.511196289417197e+02, 3.511678467565931e+02, 3.512125550436885e+02, 3.512539977066934e+02, 3.512923888627565e+02, 3.513280029132441e+02, 3.513609924467016e+02, 3.513916016041906e+02, 3.514199524569693e+02, 3.514462279605152e+02, 3.514705810152161e+02, 3.514931640468934e+02, 3.515140991258596e+02, 3.515335083227906e+02, 3.515514831912945e+02, 3.51568176223257e+02, 3.515836486528283e+02, 3.515979614125392e+02, 3.516112670898438e+02, 3.516235962026111e+02, 3.516350097862884e+02, 3.516455993940467e+02, 3.516554260047636e+02, 3.516645202531219e+02, 3.516729431132699e+02, 3.516807556205821e+02, 3.516879882929641e+02, 3.516947021652447e+02, 3.517009277201871e+02, 3.517067260661426e+02, 3.517120666479169e+02, 3.517170105003024e+02, 3.517216186586737e+02, 3.517258911227398e+02, 3.517298278708551e+02, 3.517334899843773e+02, 3.517368774391144e+02, 3.517400207526807e+02, 3.517429504427272e+02, 3.517456665094722e+02, 3.517481689383277e+02, 3.517504882768845e+02, 3.517526550272597e+02, 3.51754638671875e+02]
-time=[0e+00, 1e+00]
-volume.medium.X[1]=[9.999999776482582e-03, 9.61204710543462e-03, 9.266485445524638e-03, 8.951451609324148e-03, 8.661482458437095e-03, 8.393504676202476e-03, 8.145422642945937e-03, 7.915589033749237e-03, 7.702592258282366e-03, 7.505174794722042e-03, 7.322184302282252e-03, 7.15256388264681e-03, 6.995334249681571e-03, 6.849589225571019e-03, 6.714489318789969e-03, 6.589257230735133e-03, 6.473172416367049e-03, 6.365566998755835e-03, 6.265821004564713e-03, 6.173357346455231e-03, 6.08764358479808e-03, 6.008188190465964e-03, 5.934538776980487e-03, 5.866264486373562e-03, 5.802981523030392e-03, 5.744317546486855e-03, 5.689944091072808e-03, 5.639539152677679e-03, 5.592820239998231e-03, 5.549510906386238e-03, 5.509369121705538e-03, 5.472159021756334e-03, 5.437669786341573e-03, 5.405701271869652e-03, 5.376068419810733e-03, 5.348600897200327e-03, 5.323139520300097e-03, 5.29953745354026e-03, 5.27765880273525e-03, 5.257377838941147e-03, 5.238578200033462e-03, 5.221152206517211e-03, 5.204999333503698e-03, 5.190026956752504e-03, 5.176148839859402e-03, 5.163285400973024e-03, 5.15136403065162e-03, 5.140314808719851e-03, 5.130073045125882e-03, 5.120579162078957e-03, 5.111781414598227e-03, 5.103625815380612e-03, 5.096062072733843e-03, 5.089050139700615e-03, 5.082551403456585e-03, 5.076525739844177e-03, 5.070937798719494e-03, 5.065758243388012e-03, 5.060956340078878e-03, 5.056505080332474e-03, 5.052377945041158e-03, 5.048552998994003e-03, 5.045007915944505e-03, 5.04172127544236e-03, 5.038674916634082e-03, 5.035852075645606e-03, 5.033235537955981e-03, 5.03080943992189e-03, 5.028560759195751e-03, 5.026476922901695e-03, 5.024544892494302e-03, 5.022752560728434e-03, 5.021092020859463e-03, 5.019552542880619e-03, 5.01812528950738e-03, 5.016801413148642e-03, 5.015574860198787e-03, 5.014437248723559e-03, 5.013382990754205e-03, 5.012405572629795e-03, 5.011499860439011e-03, 5.010660272285919e-03, 5.009881685888016e-03, 5.009160375935037e-03, 5.008491685803558e-03, 5.007872359396679e-03, 5.007297267074037e-03, 5.006765015669763e-03, 5.00627141423338e-03, 5.005813668787173e-03, 5.005388985353426e-03, 5.004995503532932e-03, 5.004630890334195e-03, 5.004292819883789e-03, 5.003979429531013e-03, 5.003688856629057e-03, 5.003419238524441e-03, 5.003169645316762e-03, 5.002938211394962e-03, 5.002723541310591e-03, 5.002524703741074e-03]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_WaterDerivativeCheck.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_WaterDerivativeCheck.txt
new file mode 100644
index 00000000..5bcf45df
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_WaterDerivativeCheck.txt
@@ -0,0 +1,15 @@
+last-generated=2015-08-17
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "3",
+ "linear": " "
+}
+der(hLiqCod)=[0., 338.90400836442518084368, 1355.61603042767865190399, 3050.13612722473408211954, 5422.46411565064317983342, 8472.59936192208806460258, 12200.54449980935532948934, 16606.29673561788513325155, 21689.85645048016522196122, 27451.22245199274402693845, 33890.39743759045813931152, 41007.38326094488002127036, 48802.17798105507245054469, 57274.78157771079713711515, 66425.18693843342771288007, 76253.39241783888428471982, 86759.42577769003401044756, 97943.2557641975290607661, 109804.88975948176812380552, 122344.34683659233269281685, 135561.58973016380332410336, 149456.66562696974142454565, 164029.53303570498246699572, 179280.21227381480275653303, 195208.71188784288824535906, 211815., 229099.12624620954738929868, 247060.99606310258968733251, 265700.74774564517429098487, 285018.26645913731772452593, 305013.56959061004454270005, 325686.74500648200046271086, 347037.70306225691456347704, 369066.4395080205867998302, 391773.02303256647428497672, 415157.42043056810507550836, 439219.55894103244645521045, 463959.55057380528887733817, 489377.38731407112209126353, 515473.00666183006251230836, 542246.35888032906223088503, 569697.63496270985342562199, 597826.66241916129365563393, 626633.47920174640603363514, 656118.13212668942287564278, 686280.66144108842127025127, 717120.84903854178264737129, 748638.94130571151617914438, 780834.84747861686628311872, 813708.46839082683436572552, 847260., 881489.34553084487561136484, 916396.5048544927267357707, 951981.41547183739021420479, 988243.9841084042564034462, 1025184.58064073929563164711, 1062802.99096620385535061359, 1101099.15268171648494899273, 1140073.06572239589877426624, 1179724.98005483532324433327, 1220054.27820220519788563251, 1261061.69095216807909309864, 1302746.97999403951689600945, 1345110.02039368194527924061, 1388150.81215109536424279213, 1431869.4802019074559211731, 1476265.75785680231638252735, 1521339.92432364798150956631, 1567092.09208225319162011147, 1613522.01116677559912204742, 1660629.68164058984257280827, 1708415.2284067946020513773, 1756878.23557219468057155609, 1806019.28075592312961816788, 1855838.20223126211203634739, 1906335., 1957509.54919088073074817657, 2009361.97467396827414631844, 2061892.0264510507695376873, 2115099.63524899445474147797, 2168985.43544181203469634056, 2223549.23692614911124110222, 2278790.53980151982977986336, 2334709.84400089364498853683, 2391306.64949575299397110939, 2448581.36280137067660689354, 2506533.91671166755259037018, 2565164.47191357472911477089, 2624472.52847384894266724586, 2684458.58639070205390453339, 2745122.64559976151213049889, 2806463.83841752354055643082, 2868483.39604202099144458771, 2931180.70496200304478406906, 2994555.76520683057606220245, 3058608.57684100698679685593, 3123339.38976754574105143547, 3188747.56209119316190481186, 3254833.87343525560572743416, 3321597.93607152439653873444, 3389040.]
+der(hLiqSym)=[0., 338.90400836442518084368, 1355.61603042767865190399, 3050.13612722473408211954, 5422.46411565064317983342, 8472.59936192208806460258, 12200.54449980935532948934, 16606.29673561788513325155, 21689.85645048016522196122, 27451.22245199274402693845, 33890.39743759045813931152, 41007.38326094488002127036, 48802.17798105507245054469, 57274.78157771079713711515, 66425.18693843342771288007, 76253.39241783888428471982, 86759.42577769003401044756, 97943.2557641975290607661, 109804.88975948176812380552, 122344.34683659233269281685, 135561.58973016380332410336, 149456.66562696974142454565, 164029.53303570498246699572, 179280.21227381480275653303, 195208.71188784288824535906, 211815., 229099.12624620954738929868, 247060.99606310258968733251, 265700.74774564517429098487, 285018.26645913731772452593, 305013.56959061004454270005, 325686.74500648200046271086, 347037.70306225691456347704, 369066.4395080205867998302, 391773.02303256647428497672, 415157.42043056810507550836, 439219.55894103244645521045, 463959.55057380528887733817, 489377.38731407112209126353, 515473.00666183006251230836, 542246.35888032906223088503, 569697.63496270985342562199, 597826.66241916129365563393, 626633.47920174640603363514, 656118.13212668942287564278, 686280.66144108842127025127, 717120.84903854178264737129, 748638.94130571151617914438, 780834.84747861686628311872, 813708.46839082683436572552, 847260., 881489.34553084487561136484, 916396.5048544927267357707, 951981.41547183739021420479, 988243.9841084042564034462, 1025184.58064073929563164711, 1062802.99096620385535061359, 1101099.15268171648494899273, 1140073.06572239589877426624, 1179724.98005483532324433327, 1220054.27820220519788563251, 1261061.69095216807909309864, 1302746.97999403951689600945, 1345110.02039368194527924061, 1388150.81215109536424279213, 1431869.4802019074559211731, 1476265.75785680231638252735, 1521339.92432364798150956631, 1567092.09208225319162011147, 1613522.01116677559912204742, 1660629.68164058984257280827, 1708415.2284067946020513773, 1756878.23557219468057155609, 1806019.28075592312961816788, 1855838.20223126211203634739, 1906335., 1957509.54919088073074817657, 2009361.97467396827414631844, 2061892.0264510507695376873, 2115099.63524899445474147797, 2168985.43544181203469634056, 2223549.23692614911124110222, 2278790.53980151982977986336, 2334709.84400089364498853683, 2391306.64949575299397110939, 2448581.36280137067660689354, 2506533.91671166755259037018, 2565164.47191357472911477089, 2624472.52847384894266724586, 2684458.58639070205390453339, 2745122.64559976151213049889, 2806463.83841752354055643082, 2868483.39604202099144458771, 2931180.70496200304478406906, 2994555.76520683057606220245, 3058608.57684100698679685593, 3123339.38976754574105143547, 3188747.56209119316190481186, 3254833.87343525560572743416, 3321597.93607152439653873444, 3389040.]
+der(cvCod)=[0., 0.]
+der(cpSym)=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+time=[0., 1.]
+der(cpCod)=[0., 0.]
+der(cvSym)=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_WaterProperties.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_WaterProperties.txt
new file mode 100644
index 00000000..535d0e82
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_WaterProperties.txt
@@ -0,0 +1,24 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+p=[300000., 300000.]
+time=[0., 1.]
+X[1]=[1., 1.]
+d=[995.58599853515625, 995.58599853515625]
+eta=[0.00100000004749745131, 0.00100000004749745131]
+h=[0., 4184.00009351965036330512, 8368.00018703930072661024, 12552.00028055869006493594, 16736.00037407903801067732, 20919.99968826746771810576, 25104.00056111855519702658, 29287.99987530675934976898, 33472.00074815668631345034, 37655.99850368663464905694, 41839.9993765360995894298, 46024.00024938556452980265, 50208.00112223502219421789, 54392.00199508449441054836, 58575.99975061444274615496, 62759.99750614438380580395, 66944.00149630638770759106, 71127.9992518468206981197, 75311.99700738723913673311, 79496.0009975375869544223, 83679.99875307801994495094, 87864.00274322836776264012, 92048.00049876880075316876, 96231.99825430921919178218, 100416.00224445956700947136, 104600., 108784.00399015036236960441, 112967.99551108086598105729, 117151.99950123121379874647, 121336.00349138154706452042, 125519.9950123120506759733, 129703.9990024624130455777, 133888.00299261277541518211, 138071.99451354326447471976, 142255.9985036936413962394, 146440.00249384396011009812, 150623.99401477447827346623, 154807.99800492482609115541, 158992.00199507517390884459, 163176.00598522552172653377, 167359.99750615603988990188, 171544.0014963063586037606, 175728.00548645673552528024, 179911.99700738722458481789, 184096.00099753760150633752, 188280.0049876879493240267, 192463.99650861843838356435, 196648.00049876878620125353, 200832.00448891913401894271, 205015.99600984965218231082, 209200., 213384.00399009088869206607, 217568.0079801818064879626, 221752.01197027269518002868, 225935.99102229549316689372, 230119.99501238641096279025, 234303.99900244755554012954, 238488.00299256815924309194, 242672.00698265904793515801, 246856.01097274993662722409, 251039.99002477276371791959, 255223.99401486365240998566, 259407.99800495454110205173, 263592.00199508271180093288, 267776.00598524807719513774, 271960.00997541350079700351, 276143.98902704514330253005, 280327.99301721056690439582, 284511.99700737599050626159, 288696.00099757104180753231, 292880.0049877067212946713, 297064.00897787214489653707, 301247.98802950378740206361, 305431.99201966921100392938, 309615.99600983457639813423, 313800., 317984.00399016542360186577, 322168.00798033078899607062, 326352.01197049621259793639, 330535.99102212785510346293, 334719.9950122932787053287, 338903.99900242895819246769, 343088.00299262400949373841, 347272.00698278943309560418, 351456.01097295485669746995, 355639.99002458649920299649, 359823.99401475192280486226, 364007.99800491728819906712, 368192.00199508271180093288, 372376.00598524807719513774, 376560.00997541350079700351, 380743.98902704514330253005, 384927.99301721056690439582, 389111.99700737599050626159, 393296.00099757104180753231, 397480.0049877067212946713, 401664.00897787214489653707, 405847.98802950378740206361, 410031.99201966921100392938, 414215.99600983457639813423, 418400.]
+u=[0., 4184.00009351965036330512, 8368.00018703930072661024, 12552.00028055869006493594, 16736.00037407903801067732, 20919.99968826746771810576, 25104.00056111855519702658, 29287.99987530675934976898, 33472.00074815668631345034, 37655.99850368663464905694, 41839.9993765360995894298, 46024.00024938556452980265, 50208.00112223502219421789, 54392.00199508449441054836, 58575.99975061444274615496, 62759.99750614438380580395, 66944.00149630638770759106, 71127.9992518468206981197, 75311.99700738723913673311, 79496.0009975375869544223, 83679.99875307801994495094, 87864.00274322836776264012, 92048.00049876880075316876, 96231.99825430921919178218, 100416.00224445956700947136, 104600., 108784.00399015036236960441, 112967.99551108086598105729, 117151.99950123121379874647, 121336.00349138154706452042, 125519.9950123120506759733, 129703.9990024624130455777, 133888.00299261277541518211, 138071.99451354326447471976, 142255.9985036936413962394, 146440.00249384396011009812, 150623.99401477447827346623, 154807.99800492482609115541, 158992.00199507517390884459, 163176.00598522552172653377, 167359.99750615603988990188, 171544.0014963063586037606, 175728.00548645673552528024, 179911.99700738722458481789, 184096.00099753760150633752, 188280.0049876879493240267, 192463.99650861843838356435, 196648.00049876878620125353, 200832.00448891913401894271, 205015.99600984965218231082, 209200., 213384.00399009088869206607, 217568.0079801818064879626, 221752.01197027269518002868, 225935.99102229549316689372, 230119.99501238641096279025, 234303.99900244755554012954, 238488.00299256815924309194, 242672.00698265904793515801, 246856.01097274993662722409, 251039.99002477276371791959, 255223.99401486365240998566, 259407.99800495454110205173, 263592.00199508271180093288, 267776.00598524807719513774, 271960.00997541350079700351, 276143.98902704514330253005, 280327.99301721056690439582, 284511.99700737599050626159, 288696.00099757104180753231, 292880.0049877067212946713, 297064.00897787214489653707, 301247.98802950378740206361, 305431.99201966921100392938, 309615.99600983457639813423, 313800., 317984.00399016542360186577, 322168.00798033078899607062, 326352.01197049621259793639, 330535.99102212785510346293, 334719.9950122932787053287, 338903.99900242895819246769, 343088.00299262400949373841, 347272.00698278943309560418, 351456.01097295485669746995, 355639.99002458649920299649, 359823.99401475192280486226, 364007.99800491728819906712, 368192.00199508271180093288, 372376.00598524807719513774, 376560.00997541350079700351, 380743.98902704514330253005, 384927.99301721056690439582, 389111.99700737599050626159, 393296.00099757104180753231, 397480.0049877067212946713, 401664.00897787214489653707, 405847.98802950378740206361, 410031.99201966921100392938, 414215.99600983457639813423, 418400.]
+s=[0., 15.2896207404766162341, 30.52357169392974256539, 45.70225626462080725787, 60.82607785681546630485, 75.89542276802337994468, 90.9106923169919269867, 105.87226823150483312475, 120.78053549702379143582, 135.63585895269517322959, 150.43864220651303753584, 165.18922512051088347107, 179.88800442248813737933, 194.53531580758905761286, 209.13151463414121167261, 223.67697803664603384277, 238.17206327855498670942, 252.61709336787114921208, 267.01241037218903784378, 281.3584018508266808567, 295.6553607352630024252, 309.90363481110142629404, 324.10354783188836336194, 338.25542623230023764336, 352.35962669136205249742, 366.416412353515625, 380.42613027725229812859, 394.38908416040919746592, 408.30560137057523206749, 422.17600642446109304728, 436.00056337561966302019, 449.77959876994947308049, 463.51340702065698451406, 477.20225258108979460303, 490.84652222638294460921, 504.44641922311524240286, 518.00217789910232113471, 531.5142757918641791548, 544.98279449589767864381, 558.4081612577331270586, 571.79051937750205070188, 585.13025378496001849271, 598.42756867322282232635, 611.68272978911875270569, 624.89612130836121650646, 638.06788676576718444267, 651.1982312443363980492, 664.28759921366554408451, 677.33607354383354959282, 690.34398175085846105503, 703.3116455078125, 716.23920908310810773401, 729.12697766027793022658, 741.97513434653694730514, 754.7839080959520288161, 767.55363469839630852221, 780.284542866798005889, 792.9768157020946546254, 805.63069734929706555704, 818.24643195108478721522, 830.82412776387116082333, 843.36423989561217240407, 855.86687636982139792963, 868.33228132392252973659, 880.76063786425743273867, 893.15219013567104866524, 905.50704771550442728767, 917.82566305945351814444, 930.10808448706245599169, 942.35455613736962732219, 954.56526111260018296889, 966.74050459468946883135, 978.88027536683296148112, 990.98502332581597329408, 1003.05485910819515993353, 1015.0899658203125, 1027.09058759668118909758, 1039.05678547973366221413, 1050.9889256821531944297, 1062.88718152974138320133, 1074.75157278730239340803, 1086.58251671367202106921, 1098.3801353767951241025, 1110.14442878093109356996, 1121.87588520770464128873, 1133.57443502999967677169, 1145.24046184552412341873, 1156.87401789622458636586, 1168.47522524921191688918, 1180.04445011629695727606, 1191.58181456982947565848, 1203.08737220127750333631, 1214.56138223858215496875, 1226.00402014503947611956, 1237.41540798973301207297, 1248.79591198146567876393, 1260.1454100558435129642, 1271.46420105007746315096, 1282.75241989888331772818, 1294.01036525198242088663, 1305.238037109375]
+g=[0., -7.64946689044124905621, -30.56068563657253633892, -68.67818767542217983646, -121.94691261667480830511, -190.3121740228846476839, -273.71973895553878719511, -372.11565851037107677257, -485.44652454879116021402, -613.65907067564955923444, -756.70066139694017692818, -914.51899186736579849821, -1087.06193829153517071973, -1274.27792548986303700076, -1476.11546613731843535788, -1692.52379332525651989272, -1923.4527224128407851822, -2168.85127344599868592923, -2428.66997606200220616302, -2702.8599307033382501686, -2991.37076192262247786857, -3294.15450099561076058308, -3611.16190403945211073733, -3942.3453184426994084788, -4287.65692805632079398492, -4647.048828125, -5020.47448522849754226627, -5407.88483227118194918148, -5809.23676789812179777073, -6224.48179875743153388612, -6653.57272408215976611245, -7096.46717824878396640997, -7553.11800829067487939028, -8023.47837994409110251581, -8507.50666088530124397948, -9005.15752804555631882977, -9516.38500311468487780076, -10041.14720813515668851323, -10579.39967457152306451462, -11131.099433534087438602, -11696.20083185855037299916, -12274.66524879824646632187, -12866.44805208457364642527, -13471.50542281493471818976, -14089.79897742618413758464, -14721.28591844867150939535, -15365.92035613004736660514, -16023.66707153252900752705, -16694.48314997801935533062, -17378.32551475374930305406, -18075.158203125, -18784.93623115267837420106, -19507.62443999823153717443, -20243.17790770284045720473, -20991.55697695015987847, -21752.73150841435926849954, -22526.65411114128073677421, -23313.28767745585355442017, -24112.59509662773416494019, -24924.53925856802015914582, -25749.07224095700803445652, -26586.1706703732670575846, -27435.79060811773524619639, -28297.89299276607562205754, -29172.44462106755963759497, -30059.40447611664058058523, -30958.73200350404295022599, -31870.40276717330198152922, -32794.37433561969373840839, -33730.60959996851306641474, -34679.07145186074922094122, -35639.72863950044120429084, -36612.53626545037695905194, -37597.4746746665914542973, -38594.49904457234515575692, -39603.57421875, -40624.66894937882170779631, -41657.74807780602714046836, -42702.77254153163084993139, -43759.70865937919734278694, -44828.52997024475189391524, -45909.20286621472769184038, -47001.68828644668974447995, -48105.95497966490802355111, -49221.96778900778008392081, -50349.68870643812260823324, -51489.09992593316565034911, -52640.16351141782070044428, -53802.84040146308689145371, -54977.10325220719823846593, -56162.92081240221887128428, -57360.25075410706631373614, -58569.08000617456855252385, -59789.36631142434634966776, -61021.08232654824678320438, -62264.18899002104444662109, -63518.66286263689835323021, -64784.46511561242368770763, -66061.57568058038305025548, -67349.95970452428446151316, -68649.59375]
+f=[0., -7.64946689044124905621, -30.56068563657253633892, -68.67818767542217983646, -121.94691261667480830511, -190.3121740228846476839, -273.71973895553878719511, -372.11565851037107677257, -485.44652454879116021402, -613.65907067564955923444, -756.70066139694017692818, -914.51899186736579849821, -1087.06193829153517071973, -1274.27792548986303700076, -1476.11546613731843535788, -1692.52379332525651989272, -1923.4527224128407851822, -2168.85127344599868592923, -2428.66997606200220616302, -2702.8599307033382501686, -2991.37076192262247786857, -3294.15450099561076058308, -3611.16190403945211073733, -3942.3453184426994084788, -4287.65692805632079398492, -4647.048828125, -5020.47448522849754226627, -5407.88483227118194918148, -5809.23676789812179777073, -6224.48179875743153388612, -6653.57272408215976611245, -7096.46717824878396640997, -7553.11800829067487939028, -8023.47837994409110251581, -8507.50666088530124397948, -9005.15752804555631882977, -9516.38500311468487780076, -10041.14720813515668851323, -10579.39967457152306451462, -11131.099433534087438602, -11696.20083185855037299916, -12274.66524879824646632187, -12866.44805208457364642527, -13471.50542281493471818976, -14089.79897742618413758464, -14721.28591844867150939535, -15365.92035613004736660514, -16023.66707153252900752705, -16694.48314997801935533062, -17378.32551475374930305406, -18075.158203125, -18784.93623115267837420106, -19507.62443999823153717443, -20243.17790770284045720473, -20991.55697695015987847, -21752.73150841435926849954, -22526.65411114128073677421, -23313.28767745585355442017, -24112.59509662773416494019, -24924.53925856802015914582, -25749.07224095700803445652, -26586.1706703732670575846, -27435.79060811773524619639, -28297.89299276607562205754, -29172.44462106755963759497, -30059.40447611664058058523, -30958.73200350404295022599, -31870.40276717330198152922, -32794.37433561969373840839, -33730.60959996851306641474, -34679.07145186074922094122, -35639.72863950044120429084, -36612.53626545037695905194, -37597.4746746665914542973, -38594.49904457234515575692, -39603.57421875, -40624.66894937882170779631, -41657.74807780602714046836, -42702.77254153163084993139, -43759.70865937919734278694, -44828.52997024475189391524, -45909.20286621472769184038, -47001.68828644668974447995, -48105.95497966490802355111, -49221.96778900778008392081, -50349.68870643812260823324, -51489.09992593316565034911, -52640.16351141782070044428, -53802.84040146308689145371, -54977.10325220719823846593, -56162.92081240221887128428, -57360.25075410706631373614, -58569.08000617456855252385, -59789.36631142434634966776, -61021.08232654824678320438, -62264.18899002104444662109, -63518.66286263689835323021, -64784.46511561242368770763, -66061.57568058038305025548, -67349.95970452428446151316, -68649.59375]
+hIse=[0., 4184.00009351965036330512, 8368.00018703930072661024, 12552.00028055869006493594, 16736.00037407903801067732, 20919.99968826746771810576, 25104.00056111855519702658, 29287.99987530675934976898, 33472.00074815668631345034, 37655.99850368663464905694, 41839.9993765360995894298, 46024.00024938556452980265, 50208.00112223502219421789, 54392.00199508449441054836, 58575.99975061444274615496, 62759.99750614438380580395, 66944.00149630638770759106, 71127.9992518468206981197, 75311.99700738723913673311, 79496.0009975375869544223, 83679.99875307801994495094, 87864.00274322836776264012, 92048.00049876880075316876, 96231.99825430921919178218, 100416.00224445956700947136, 104600., 108784.00399015036236960441, 112967.99551108086598105729, 117151.99950123121379874647, 121336.00349138154706452042, 125519.9950123120506759733, 129703.9990024624130455777, 133888.00299261277541518211, 138071.99451354326447471976, 142255.9985036936413962394, 146440.00249384396011009812, 150623.99401477447827346623, 154807.99800492482609115541, 158992.00199507517390884459, 163176.00598522552172653377, 167359.99750615603988990188, 171544.0014963063586037606, 175728.00548645673552528024, 179911.99700738722458481789, 184096.00099753760150633752, 188280.0049876879493240267, 192463.99650861843838356435, 196648.00049876878620125353, 200832.00448891913401894271, 205015.99600984965218231082, 209200., 213384.00399009088869206607, 217568.0079801818064879626, 221752.01197027269518002868, 225935.99102229549316689372, 230119.99501238641096279025, 234303.99900244755554012954, 238488.00299256815924309194, 242672.00698265904793515801, 246856.01097274993662722409, 251039.99002477276371791959, 255223.99401486365240998566, 259407.99800495454110205173, 263592.00199508271180093288, 267776.00598524807719513774, 271960.00997541350079700351, 276143.98902704514330253005, 280327.99301721056690439582, 284511.99700737599050626159, 288696.00099757104180753231, 292880.0049877067212946713, 297064.00897787214489653707, 301247.98802950378740206361, 305431.99201966921100392938, 309615.99600983457639813423, 313800., 317984.00399016542360186577, 322168.00798033078899607062, 326352.01197049621259793639, 330535.99102212785510346293, 334719.9950122932787053287, 338903.99900242895819246769, 343088.00299262400949373841, 347272.00698278943309560418, 351456.01097295485669746995, 355639.99002458649920299649, 359823.99401475192280486226, 364007.99800491728819906712, 368192.00199508271180093288, 372376.00598524807719513774, 376560.00997541350079700351, 380743.98902704514330253005, 384927.99301721056690439582, 389111.99700737599050626159, 393296.00099757104180753231, 397480.0049877067212946713, 401664.00897787214489653707, 405847.98802950378740206361, 410031.99201966921100392938, 414215.99600983457639813423, 418400.]
+beta=[0., 0.]
+kappa=[0., 0.]
+ddpT=[0., 0.]
+ddTp=[0., 0.]
+dddX[1]=[0., 0.]
+cp=[4184., 4184.]
+cv=[4184., 4184.]
+lambda=[0.59799998998641967773, 0.59799998998641967773]
+pMed=[300000., 300000.]
+TMed=[273.149993896484375, 274.14999391883748103282, 275.14999394119058706565, 276.14999396354363625505, 277.1499939858967991313, 278.14999382198539024103, 279.14999403060301119694, 280.14999386668472425299, 281.14999407530888220208, 282.14999353888998712137, 283.14999374748668969914, 284.14999395609254406736, 285.1499941647210789597, 286.14999437334967069546, 287.14999383688530087966, 288.14999330049369064, 289.14999425413333256074, 290.14999371768715263897, 291.14999318129554239931, 292.14999413491705126944, 293.14999359848906124171, 294.14999455217417789754, 295.14999401570071313472, 296.14999347929091300102, 297.14999443295783976282, 298.149993896484375, 299.14999485021496639092, 300.14999282370115452068, 301.14999377728622675932, 302.1499947309986282562, 303.14999270450300627999, 304.14999365808807851863, 305.1499946117823469649, 306.14999258530491488273, 307.14999353888998712137, 308.14999449256600883018, 309.14999246610676664204, 310.14999341969183888068, 311.14999437334967069546, 312.14999532708026208638, 313.14999330049369064, 314.14999425413333256074, 315.14999520786392395166, 316.14999318129554239931, 317.14999413491705126944, 318.14999508864764266036, 319.14999306209745100205, 320.14999401570071313472, 321.14999496943130452564, 322.14999294289930276136, 323.149993896484375, 324.14999485020075553621, 325.14999580391713607241, 326.14999675763351660862, 327.14999175094993688617, 328.1499927045207982701, 329.14999365808455422666, 330.14999461177166040216, 331.14999556548804093836, 332.14999651920442147457, 333.14999151255722154019, 334.14999246612808292412, 335.14999341969894430804, 336.1499943733425652681, 337.14999532705894580431, 338.14999628077532634052, 339.14999127416450619421, 340.14999222773536757813, 341.14999318130622896206, 342.14999413492057556141, 343.14999508862985067026, 344.14999604234623120647, 345.14999103577179084823, 346.14999198934265223215, 347.14999294291351361608, 348.149993896484375, 349.14999485020075553621, 350.14999580391713607241, 351.14999675763351660862, 352.14999175094993688617, 353.1499927045207982701, 354.14999365808455422666, 355.14999461177166040216, 356.14999556548804093836, 357.14999651920442147457, 358.14999151255722154019, 359.14999246612808292412, 360.14999341969894430804, 361.1499943733425652681, 362.14999532705894580431, 363.14999628077532634052, 364.14999127416450619421, 365.14999222773536757813, 366.14999318130622896206, 367.14999413492057556141, 368.14999508862985067026, 369.14999604234623120647, 370.14999103577179084823, 371.14999198934265223215, 372.14999294291351361608, 373.149993896484375]
+MM=[0.01801526732742786407, 0.01801526732742786407]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_TrapezoidalIntegration.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_WaterTemperatureEnthalpyInversion.txt
similarity index 65%
rename from BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_TrapezoidalIntegration.txt
rename to BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_WaterTemperatureEnthalpyInversion.txt
index c299d43a..8587c9d4 100644
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_TrapezoidalIntegration.txt
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_WaterTemperatureEnthalpyInversion.txt
@@ -1,4 +1,5 @@
last-generated=2015-05-08
statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-y=[286., 286.]
+T=[293.149993896484375, 293.149993896484375]
time=[0., 1.]
+h=[83680., 83680.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_WaterTestImplementation.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_WaterTestImplementation.txt
new file mode 100644
index 00000000..aa53527b
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_WaterTestImplementation.txt
@@ -0,0 +1,5 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'number of continuous time states': '1', 'linear': ' '}
+volume.medium.T=[293.149993896484375, 293.15588378919551360013, 293.16177368190665220027, 293.1676635746177908004, 293.17355346732892940054, 293.17944335893162133289, 293.18533325273074297002, 293.19122314435389853315, 293.19708252059535880107, 293.20297241003572707996, 293.20886230380074266577, 293.21475219761123298667, 293.22061157386178820161, 293.22650146768137346953, 293.23239135706717206631, 293.23828124645297066309, 293.24414062712821760215, 293.25003051651401619893, 293.2559204058998147957, 293.26177978657506173477, 293.26766967596086033154, 293.27352905663610727061, 293.27941894600371597335, 293.28527831789324409328, 293.29116821600109688006, 293.297027587890625, 293.30291748599847778678, 293.30877684924780623987, 293.31466674733746913262, 293.32052612801271607168, 293.32641600853094132617, 293.33227538924256805331, 293.3381347698814352043, 293.34402465039966045879, 293.34988403112947707996, 293.35574341175015433691, 293.36163329226837959141, 293.36749267294362653047, 293.37335205361887346953, 293.37921143429412040859, 293.38510131481234566309, 293.39096069543302292004, 293.39682007596275070682, 293.40267943921207915992, 293.40853881977818673477, 293.41439820045343367383, 293.42025756352086318657, 293.42611694406878086738, 293.43200684215844376013, 293.43786620526225306094, 293.4437255859375, 293.44958496646711409994, 293.4554443469967850433, 293.46127321038483160009, 293.46713255591771485342, 293.47299193644732895336, 293.47885131697694305331, 293.48471069750661399667, 293.49057007803622809661, 293.49642945856584219655, 293.50228880417148502602, 293.50811766748677200667, 293.51397704801644295003, 293.51983642854605704997, 293.52569580907572799333, 293.53152467239101497398, 293.53738401799665780345, 293.54324339852627190339, 293.54910277894674663912, 293.55493164200743194669, 293.56079102253704604664, 293.56661988581595323922, 293.57247923145797585676, 293.57833861169655165213, 293.58416747493913590006, 293.59002685546875, 293.59585571842023909994, 293.6017150989499100433, 293.60754396190139914324, 293.61340330754342176078, 293.61923217082232895336, 293.62506103377381805331, 293.63092041430348899667, 293.63674927725497809661, 293.64260865778459219655, 293.64843748617590790673, 293.65426634912739700667, 293.66012572958430837389, 293.66595459260855704997, 293.67178345556010299333, 293.67761231887538997398, 293.68347166408085513467, 293.68930052743252190339, 293.69512939038401100333, 293.70095825333555694669, 293.70678711628704604664, 293.71261597956595323922, 293.71847532477141839991, 293.72430418786842665213, 293.73013305096549174777, 293.7359619140625]
+time=[0., 1.]
+volume.medium.X[1]=[1., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_AirDerivativeCheck.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Air_Examples_PerfectGasDerivativeCheck.txt
similarity index 53%
rename from BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_AirDerivativeCheck.txt
rename to BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Air_Examples_PerfectGasDerivativeCheck.txt
index fb1de88c..400e9949 100644
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_AirDerivativeCheck.txt
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Air_Examples_PerfectGasDerivativeCheck.txt
@@ -1,17 +1,15 @@
-last-generated=2015-08-17
+last-generated=2015-08-19
statistics-simulation=
{
"numerical Jacobians": "0",
"nonlinear": " ",
- "number of continuous time states": "5",
+ "number of continuous time states": "3",
"linear": " "
}
der(hLiqCod)=[0., 338.90400836442518084368, 1355.61603042767865190399, 3050.13612722473408211954, 5422.46411565064317983342, 8472.59936192208806460258, 12200.54449980935532948934, 16606.29673561788513325155, 21689.85645048016522196122, 27451.22245199274402693845, 33890.39743759045813931152, 41007.38326094488002127036, 48802.17798105507245054469, 57274.78157771079713711515, 66425.18693843342771288007, 76253.39241783888428471982, 86759.42577769003401044756, 97943.2557641975290607661, 109804.88975948176812380552, 122344.34683659233269281685, 135561.58973016380332410336, 149456.66562696974142454565, 164029.53303570498246699572, 179280.21227381480275653303, 195208.71188784288824535906, 211815., 229099.12624620954738929868, 247060.99606310258968733251, 265700.74774564517429098487, 285018.26645913731772452593, 305013.56959061004454270005, 325686.74500648200046271086, 347037.70306225691456347704, 369066.4395080205867998302, 391773.02303256647428497672, 415157.42043056810507550836, 439219.55894103244645521045, 463959.55057380528887733817, 489377.38731407112209126353, 515473.00666183006251230836, 542246.35888032906223088503, 569697.63496270985342562199, 597826.66241916129365563393, 626633.47920174640603363514, 656118.13212668942287564278, 686280.66144108842127025127, 717120.84903854178264737129, 748638.94130571151617914438, 780834.84747861686628311872, 813708.46839082683436572552, 847260., 881489.34553084487561136484, 916396.5048544927267357707, 951981.41547183739021420479, 988243.9841084042564034462, 1025184.58064073929563164711, 1062802.99096620385535061359, 1101099.15268171648494899273, 1140073.06572239589877426624, 1179724.98005483532324433327, 1220054.27820220519788563251, 1261061.69095216807909309864, 1302746.97999403951689600945, 1345110.02039368194527924061, 1388150.81215109536424279213, 1431869.4802019074559211731, 1476265.75785680231638252735, 1521339.92432364798150956631, 1567092.09208225319162011147, 1613522.01116677559912204742, 1660629.68164058984257280827, 1708415.2284067946020513773, 1756878.23557219468057155609, 1806019.28075592312961816788, 1855838.20223126211203634739, 1906335., 1957509.54919088073074817657, 2009361.97467396827414631844, 2061892.0264510507695376873, 2115099.63524899445474147797, 2168985.43544181203469634056, 2223549.23692614911124110222, 2278790.53980151982977986336, 2334709.84400089364498853683, 2391306.64949575299397110939, 2448581.36280137067660689354, 2506533.91671166755259037018, 2565164.47191357472911477089, 2624472.52847384894266724586, 2684458.58639070205390453339, 2745122.64559976151213049889, 2806463.83841752354055643082, 2868483.39604202099144458771, 2931180.70496200304478406906, 2994555.76520683057606220245, 3058608.57684100698679685593, 3123339.38976754574105143547, 3188747.56209119316190481186, 3254833.87343525560572743416, 3321597.93607152439653873444, 3389040.]
der(hLiqSym)=[0., 338.90400836442518084368, 1355.61603042767865190399, 3050.13612722473408211954, 5422.46411565064317983342, 8472.59936192208806460258, 12200.54449980935532948934, 16606.29673561788513325155, 21689.85645048016522196122, 27451.22245199274402693845, 33890.39743759045813931152, 41007.38326094488002127036, 48802.17798105507245054469, 57274.78157771079713711515, 66425.18693843342771288007, 76253.39241783888428471982, 86759.42577769003401044756, 97943.2557641975290607661, 109804.88975948176812380552, 122344.34683659233269281685, 135561.58973016380332410336, 149456.66562696974142454565, 164029.53303570498246699572, 179280.21227381480275653303, 195208.71188784288824535906, 211815., 229099.12624620954738929868, 247060.99606310258968733251, 265700.74774564517429098487, 285018.26645913731772452593, 305013.56959061004454270005, 325686.74500648200046271086, 347037.70306225691456347704, 369066.4395080205867998302, 391773.02303256647428497672, 415157.42043056810507550836, 439219.55894103244645521045, 463959.55057380528887733817, 489377.38731407112209126353, 515473.00666183006251230836, 542246.35888032906223088503, 569697.63496270985342562199, 597826.66241916129365563393, 626633.47920174640603363514, 656118.13212668942287564278, 686280.66144108842127025127, 717120.84903854178264737129, 748638.94130571151617914438, 780834.84747861686628311872, 813708.46839082683436572552, 847260., 881489.34553084487561136484, 916396.5048544927267357707, 951981.41547183739021420479, 988243.9841084042564034462, 1025184.58064073929563164711, 1062802.99096620385535061359, 1101099.15268171648494899273, 1140073.06572239589877426624, 1179724.98005483532324433327, 1220054.27820220519788563251, 1261061.69095216807909309864, 1302746.97999403951689600945, 1345110.02039368194527924061, 1388150.81215109536424279213, 1431869.4802019074559211731, 1476265.75785680231638252735, 1521339.92432364798150956631, 1567092.09208225319162011147, 1613522.01116677559912204742, 1660629.68164058984257280827, 1708415.2284067946020513773, 1756878.23557219468057155609, 1806019.28075592312961816788, 1855838.20223126211203634739, 1906335., 1957509.54919088073074817657, 2009361.97467396827414631844, 2061892.0264510507695376873, 2115099.63524899445474147797, 2168985.43544181203469634056, 2223549.23692614911124110222, 2278790.53980151982977986336, 2334709.84400089364498853683, 2391306.64949575299397110939, 2448581.36280137067660689354, 2506533.91671166755259037018, 2565164.47191357472911477089, 2624472.52847384894266724586, 2684458.58639070205390453339, 2745122.64559976151213049889, 2806463.83841752354055643082, 2868483.39604202099144458771, 2931180.70496200304478406906, 2994555.76520683057606220245, 3058608.57684100698679685593, 3123339.38976754574105143547, 3188747.56209119316190481186, 3254833.87343525560572743416, 3321597.93607152439653873444, 3389040.]
+der(hAirCod)=[0., 81.4860040680137842628, 325.94401554351247796149, 733.37405731463525171421, 1303.77606071698505729728, 2037.14996491652073018486, 2933.49622707298794921371, 3992.81393133077835955191, 5215.10423995326164003927, 6600.36569221661466144724, 8148.59985723799854895333, 9859.80577188644383568317, 11733.98490391928135068156, 13771.13480707750204601325, 15971.25572435212961863726, 18334.34816200951900100335, 20860.41695398414594819769, 23549.45263250830976176076, 26401.46275720516132423654, 29416.44605464151754858904, 32594.39942409457216854207, 35935.326473340013762936, 39439.22308560280362144113, 43106.09219287023006472737, 46935.93960693377448478714, 50928.75, 55084.53921276627079350874, 59403.28826529648358700797, 63885.0228954667181824334, 68529.73051994235720485449, 73337.39262862004397902638, 78308.0456743693066528067, 83441.66780428575293626636, 88738.25078157830284908414, 94197.81052420783089473844, 99820.35497206501895561814, 105605.85100551899813581258, 111554.33306996359897311777, 117665.78421079885447397828, 123940.21224052475008647889, 130377.59768666927993763238, 136977.97114543130737729371, 143741.30587205142364837229, 150667.60437431081663817167, 157756.89233853694167919457, 165009.16501186502864584327, 172424.36875788829638622701, 180002.57904004119336605072, 187743.75841021694941446185, 195647.88302482714061625302, 203715., 211945.10169188646250404418, 220338.15681975489133037627, 228894.19663338179816491902, 237613.15302659815642982721, 246495.14558430193574167788, 255540.091577941580908373, 264748.006655900739133358, 274118.92205215315334498882, 283652.8065093503100797534, 293349.57047589775174856186, 303209.39205241395393386483, 313232.18268976308172568679, 323417.94240351661574095488, 333766.67119367455597966909, 344278.36904466548003256321, 354953.00308370590209960938, 365790.63805427658371627331, 376791.24208527052542194724, 387954.84643496299395337701, 399281.41986868571257218719, 410770.96236298611620441079, 422423.40397563698934391141, 434238.88358959171455353498, 446217.33226452837698161602, 458358.75, 470663.13682744750985875726, 483130.5239657279453240335, 495760.84891484136460348964, 508554.09740925353253260255, 521510.3907273506629280746, 534629.62185655965004116297, 547911.88456995971500873566, 561357.08510162413585931063, 574965.22344464308116585016, 588736.34201162273529917002, 602670.41747451946139335632, 616767.55574690806679427624, 631027.56934622267726808786, 645450.64577156910672783852, 660036.6600081955548375845, 674785.52364923269487917423, 689697.47500454483088105917, 704772.42667098797392100096, 720010.3161563449539244175, 735411.14347563695628196001, 750975.03360549837816506624, 766701.70481984794605523348, 782591.53206876770127564669, 798644.29712881834711879492, 814860.]
der(hSteCod)=[0., 150.66001107063658537299, 602.64004293554160085478, 1355.94000404195821829489, 2410.56016904811622225679, 3766.49988999454262739164, 5423.76001212723622302292, 7382.33978178769575606566, 9642.24067080322492984124, 12203.4590018716044141911, 15065.99955548936850391328, 18229.85957435676027671434, 21695.04004042513770400546, 25461.54094471308053471148, 29529.35912535542229306884, 33898.49732395477622048929, 38568.96267243868351215497, 43540.73737067681213375181, 48813.83598593100032303482, 54388.26309089270944241434, 60263.99821297605376457796, 66441.06666852386842947453, 72919.43829383446427527815, 79699.13774600370379630476, 86780.1601455444615567103, 94162.5, 101846.16375011176569387317, 109831.13192875118693336844, 118117.43649783376895356923, 126705.06981690699467435479, 135593.98925991670694202185, 144784.26340514124603942037, 154275.85066818533232435584, 164068.72137551411287859082, 174162.94947195050190202892, 184558.50630397000350058079, 195255.3439005852269474417, 206253.54157317758654244244, 217553.05234919124632142484, 229153.87622873796499334276, 241055.99283395300153642893, 253259.45755396070308052003, 265764.26663444918813183904, 278570.33450410899240523577, 291677.75316816673148423433, 305086.51619995082728564739, 318796.55095885053742676973, 332807.93919183709658682346, 347120.64054990757722407579, 361734.64219808444613590837, 376650., 391866.67093395174015313387, 407384.65494278055848553777, 423203.98327603936195373535, 439324.5276509835384786129, 455746.48028013715520501137, 472469.7459840854280628264, 489494.35605599009431898594, 506820.27921699441503733397, 524447.48420287587214261293, 542375.95696841005701571703, 560605.84875011176336556673, 579137.05360624345485121012, 597969.57156601105816662312, 617103.4026294144568964839, 636538.54676724784076213837, 656274.88542415446136146784, 676312.71635754744056612253, 696651.79786656249780207872, 717292.25496423663571476936, 738234.0251795558724552393, 759477.10846960206981748343, 781021.37551698694005608559, 802867.08310341229662299156, 825014.16626411862671375275, 847462.5, 870212.2093676798976957798, 893263.1693105349550023675, 916615.50482767110224813223, 940269.0114872597623616457, 964223.9713004769291728735, 988480.24418802536092698574, 1013037.83019400970079004765, 1037896.79178877954836934805, 1063057.06645730882883071899, 1088518.43900908948853611946, 1114281.33797362539917230606, 1140345.48751452844589948654, 1166711.01265802420675754547, 1193377.91340500675141811371, 1220346.06472656829282641411, 1247615.42816808237694203854, 1275186.20378602296113967896, 1303058.35497854277491569519, 1331231.7567602966446429491, 1359706.53415958862751722336, 1388482.56213366100564599037, 1417559.91646490828134119511, 1446938.56873535970225930214, 1476618.59658039035275578499, 1506600.]
-der(cvCod)=[0., 0.00203858372535295571, 0.00815433488318557248, 0.0183472548704801397, 0.03261733949628895651, 0.05096459239884224002, 0.07338901942724496141, 0.09989059632621792584, 0.13046935791224315015, 0.16512526764152787861, 0.20385836953462876942, 0.24666862459519198203, 0.29355607759960272718, 0.34452065392058800475, 0.39956238528058368731, 0.4586812789740997709, 0.52187743150322285501, 0.58915065486955264795, 0.6605010702743987494, 0.73592873284187521055, 0.81543347801701249189, 0.89901548304016221103, 0.98667449833214915245, 1.07841070571134256539, 1.17422431017954642662, 1.27411484718322753906, 1.37808261529382791721, 1.48612737809685024892, 1.59824954107376915324, 1.71444902783826846893, 1.83472511541038896254, 1.95907887792961732387, 2.08750972572128512539, 2.22001749568859585438, 2.35660261933240722243, 2.4972651857781871243, 2.64200428051523550366, 2.79082100370036156889, 2.94371493117338101086, 3.10068606293258852702, 3.26173391182504479602, 3.42685920032416557746, 3.59606193162525578089, 3.76934110528659749306, 3.94669799323153647208, 4.12813208565706801778, 4.31364282250516328787, 4.50323154831336136539, 4.69689724028077648654, 4.89463930189860896292, 5.09645938873291015625, 5.30235644182066767627, 5.51233046039165852648, 5.72638239810655491624, 5.94450951151705098141, 6.16671535511838353472, 6.39299816419734945327, 6.62335841617746101662, 6.85779611066676864084, 7.09631029380385580652, 7.338900460678211779, 7.58556950336297663995, 7.8363155115264264694, 8.09113896239452223824, 8.35003890229976875048, 8.61301676134437244059, 8.88006998168940775429, 9.15120174663295493644, 9.4264104770426797586, 9.70569712680180529674, 9.9890607426188200435, 10.27650132391651993657, 10.56801712090019407242, 10.86361160809115133929, 11.16328401441692008689, 11.46703338623046875, 11.77485972430030614078, 12.08676302784883027641, 12.40274425055035401044, 12.72280051823881663609, 13.04693564681995532339, 13.37514774087743596453, 13.70743680100148864653, 14.04380378047060240476, 14.38424772541840113149, 14.72876656974663944766, 15.07736442057405312767, 15.43004019055219444567, 15.78679197273032741577, 16.14762167444344242995, 16.51252834164888483315, 16.88151071626733923381, 17.25457128935353523502, 17.63170978157681290099, 18.01292619315590215479, 18.39821861711597605904, 18.78758896022041113838, 19.18103295782478667775, 19.57855720681451927589, 19.98015746763590527735, 20.385837554931640625]
-der(cpSym)=[0., 0.00256200007654129114, 0.01024800028325922006, 0.02305800015449142523, 0.04099200108722436675, 0.06404999456498199073, 0.09223200054925215219, 0.12553800537122161707, 0.16396800425726359984, 0.20752198853367714859, 0.25619997818359752095, 0.31000200252987597516, 0.3689280020595475662, 0.43297803622447528227, 0.50215202145436221848, 0.57644994476590460941, 0.65587201684578810834, 0.74041800142606417623, 0.83008795376817590128, 0.92488201805788139431, 1.02479991258166824863, 1.12984211380937993319, 1.24000801005843297453, 1.35529799333936273875, 1.47571200796353063645, 1.60125005245208740234, 1.73191214440904861505, 1.86769780629708903597, 2.00860808575634264272, 2.15464222952784112408, 2.30579977845255301716, 2.46208187143061785207, 2.6234880670165128258, 2.79001786060640499798, 2.96167200552114984191, 3.1384500145036424712, 3.32035181433942483409, 3.50737801119028125285, 3.69952807198709932024, 3.8968022351484585819, 4.09919965002185104908, 4.30672223946858778731, 4.51936845456378399888, 4.73713763726775649587, 4.96003204011151854758, 5.1880500687287955941, 5.42119197292970511626, 5.65945818917020737615, 5.90284803130416335648, 6.15136170333565335255, 6.40500020980834960938, 6.66376234229242303542, 6.92764857665090261207, 7.19665891288378833934, 7.47079122409982687714, 7.75004973256238205437, 8.03443234290185515079, 8.32393857901534239829, 8.61856891724846896352, 8.91832240368623097027, 9.22319911260466973602, 9.53320172493959816507, 9.84832748548143577239, 10.16857830205856849659, 10.49395226732918295909, 10.82445033447875104571, 11.16007144109447324354, 11.50081768046688956986, 11.84668802172166834907, 12.19768246509324249871, 12.55380005739428206368, 12.91504270525110698031, 13.28140725590002801937, 13.65289712231902718997, 14.02951204427765397043, 14.41125011444091796875, 14.79811228745627715853, 15.19009856234149680176, 15.58720893911021576628, 15.98944100416351510319, 16.39679859948645201939, 16.80928220402265793609, 17.22688895750152227038, 17.64961885943218788952, 18.07747381690020560541, 18.51044932598897929665, 18.94855054835053920215, 19.39177873360036130634, 19.84012816019730252037, 20.29360264283863557466, 20.75220027367096520265, 21.2159201804808965619, 21.68476789087901934749, 22.1587368421490644721, 22.63783275656089699623, 23.12204991256083985718, 23.61139212410610710435, 24.10585642861445876406, 24.60544681237461972501, 25.110162251706238834, 25.6200008392333984375]
+der(hAirSym)=[0., 81.4860040680137842628, 325.94401554351247796149, 733.37405731463525171421, 1303.77606071698505729728, 2037.14996491652073018486, 2933.49622707298794921371, 3992.81393133077835955191, 5215.10423995326164003927, 6600.36569221661466144724, 8148.59985723799854895333, 9859.80577188644383568317, 11733.98490391928135068156, 13771.13480707750204601325, 15971.25572435212961863726, 18334.34816200951900100335, 20860.41695398414594819769, 23549.45263250830976176076, 26401.46275720516132423654, 29416.44605464151754858904, 32594.39942409457216854207, 35935.326473340013762936, 39439.22308560280362144113, 43106.09219287023006472737, 46935.93960693377448478714, 50928.75, 55084.53921276627079350874, 59403.28826529648358700797, 63885.0228954667181824334, 68529.73051994235720485449, 73337.39262862004397902638, 78308.0456743693066528067, 83441.66780428575293626636, 88738.25078157830284908414, 94197.81052420783089473844, 99820.35497206501895561814, 105605.85100551899813581258, 111554.33306996359897311777, 117665.78421079885447397828, 123940.21224052475008647889, 130377.59768666927993763238, 136977.97114543130737729371, 143741.30587205142364837229, 150667.60437431081663817167, 157756.89233853694167919457, 165009.16501186502864584327, 172424.36875788829638622701, 180002.57904004119336605072, 187743.75841021694941446185, 195647.88302482714061625302, 203715., 211945.10169188646250404418, 220338.15681975489133037627, 228894.19663338179816491902, 237613.15302659815642982721, 246495.14558430193574167788, 255540.091577941580908373, 264748.006655900739133358, 274118.92205215315334498882, 283652.8065093503100797534, 293349.57047589775174856186, 303209.39205241395393386483, 313232.18268976308172568679, 323417.94240351661574095488, 333766.67119367455597966909, 344278.36904466548003256321, 354953.00308370590209960938, 365790.63805427658371627331, 376791.24208527052542194724, 387954.84643496299395337701, 399281.41986868571257218719, 410770.96236298611620441079, 422423.40397563698934391141, 434238.88358959171455353498, 446217.33226452837698161602, 458358.75, 470663.13682744750985875726, 483130.5239657279453240335, 495760.84891484136460348964, 508554.09740925353253260255, 521510.3907273506629280746, 534629.62185655965004116297, 547911.88456995971500873566, 561357.08510162413585931063, 574965.22344464308116585016, 588736.34201162273529917002, 602670.41747451946139335632, 616767.55574690806679427624, 631027.56934622267726808786, 645450.64577156910672783852, 660036.6600081955548375845, 674785.52364923269487917423, 689697.47500454483088105917, 704772.42667098797392100096, 720010.3161563449539244175, 735411.14347563695628196001, 750975.03360549837816506624, 766701.70481984794605523348, 782591.53206876770127564669, 798644.29712881834711879492, 814860.]
time=[0., 1.]
-der(cpCod)=[0., 0.00256200007654129114, 0.01024800028325922006, 0.02305800015449142523, 0.04099200108722436675, 0.06404999456498199073, 0.09223200054925215219, 0.12553800537122161707, 0.16396800425726359984, 0.20752198853367714859, 0.25619997818359752095, 0.31000200252987597516, 0.3689280020595475662, 0.43297803622447528227, 0.50215202145436221848, 0.57644994476590460941, 0.65587201684578810834, 0.74041800142606417623, 0.83008795376817590128, 0.92488201805788139431, 1.02479991258166824863, 1.12984211380937993319, 1.24000801005843297453, 1.35529799333936273875, 1.47571200796353063645, 1.60125005245208740234, 1.73191214440904861505, 1.86769780629708903597, 2.00860808575634264272, 2.15464222952784112408, 2.30579977845255301716, 2.46208187143061785207, 2.6234880670165128258, 2.79001786060640499798, 2.96167200552114984191, 3.1384500145036424712, 3.32035181433942483409, 3.50737801119028125285, 3.69952807198709932024, 3.8968022351484585819, 4.09919965002185104908, 4.30672223946858778731, 4.51936845456378399888, 4.73713763726775649587, 4.96003204011151854758, 5.1880500687287955941, 5.42119197292970511626, 5.65945818917020737615, 5.90284803130416335648, 6.15136170333565335255, 6.40500020980834960938, 6.66376234229242303542, 6.92764857665090261207, 7.19665891288378833934, 7.47079122409982687714, 7.75004973256238205437, 8.03443234290185515079, 8.32393857901534239829, 8.61856891724846896352, 8.91832240368623097027, 9.22319911260466973602, 9.53320172493959816507, 9.84832748548143577239, 10.16857830205856849659, 10.49395226732918295909, 10.82445033447875104571, 11.16007144109447324354, 11.50081768046688956986, 11.84668802172166834907, 12.19768246509324249871, 12.55380005739428206368, 12.91504270525110698031, 13.28140725590002801937, 13.65289712231902718997, 14.02951204427765397043, 14.41125011444091796875, 14.79811228745627715853, 15.19009856234149680176, 15.58720893911021576628, 15.98944100416351510319, 16.39679859948645201939, 16.80928220402265793609, 17.22688895750152227038, 17.64961885943218788952, 18.07747381690020560541, 18.51044932598897929665, 18.94855054835053920215, 19.39177873360036130634, 19.84012816019730252037, 20.29360264283863557466, 20.75220027367096520265, 21.2159201804808965619, 21.68476789087901934749, 22.1587368421490644721, 22.63783275656089699623, 23.12204991256083985718, 23.61139212410610710435, 24.10585642861445876406, 24.60544681237461972501, 25.110162251706238834, 25.6200008392333984375]
-der(cvSym)=[0., 0.00203858372535295571, 0.00815433488318557248, 0.0183472548704801397, 0.03261733949628895651, 0.05096459239884224002, 0.07338901942724496141, 0.09989059632621792584, 0.13046935791224315015, 0.16512526764152787861, 0.20385836953462876942, 0.24666862459519198203, 0.29355607759960272718, 0.34452065392058800475, 0.39956238528058368731, 0.4586812789740997709, 0.52187743150322285501, 0.58915065486955264795, 0.6605010702743987494, 0.73592873284187521055, 0.81543347801701249189, 0.89901548304016221103, 0.98667449833214915245, 1.07841070571134256539, 1.17422431017954642662, 1.27411484718322753906, 1.37808261529382791721, 1.48612737809685024892, 1.59824954107376915324, 1.71444902783826846893, 1.83472511541038896254, 1.95907887792961732387, 2.08750972572128512539, 2.22001749568859585438, 2.35660261933240722243, 2.4972651857781871243, 2.64200428051523550366, 2.79082100370036156889, 2.94371493117338101086, 3.10068606293258852702, 3.26173391182504479602, 3.42685920032416557746, 3.59606193162525578089, 3.76934110528659749306, 3.94669799323153647208, 4.12813208565706801778, 4.31364282250516328787, 4.50323154831336136539, 4.69689724028077648654, 4.89463930189860896292, 5.09645938873291015625, 5.30235644182066767627, 5.51233046039165852648, 5.72638239810655491624, 5.94450951151705098141, 6.16671535511838353472, 6.39299816419734945327, 6.62335841617746101662, 6.85779611066676864084, 7.09631029380385580652, 7.338900460678211779, 7.58556950336297663995, 7.8363155115264264694, 8.09113896239452223824, 8.35003890229976875048, 8.61301676134437244059, 8.88006998168940775429, 9.15120174663295493644, 9.4264104770426797586, 9.70569712680180529674, 9.9890607426188200435, 10.27650132391651993657, 10.56801712090019407242, 10.86361160809115133929, 11.16328401441692008689, 11.46703338623046875, 11.77485972430030614078, 12.08676302784883027641, 12.40274425055035401044, 12.72280051823881663609, 13.04693564681995532339, 13.37514774087743596453, 13.70743680100148864653, 14.04380378047060240476, 14.38424772541840113149, 14.72876656974663944766, 15.07736442057405312767, 15.43004019055219444567, 15.78679197273032741577, 16.14762167444344242995, 16.51252834164888483315, 16.88151071626733923381, 17.25457128935353523502, 17.63170978157681290099, 18.01292619315590215479, 18.39821861711597605904, 18.78758896022041113838, 19.18103295782478667775, 19.57855720681451927589, 19.98015746763590527735, 20.385837554931640625]
der(hSteSym)=[0., 150.66001107063658537299, 602.64004293554160085478, 1355.94000404195821829489, 2410.56016904811622225679, 3766.49988999454262739164, 5423.76001212723622302292, 7382.33978178769575606566, 9642.24067080322492984124, 12203.4590018716044141911, 15065.99955548936850391328, 18229.85957435676027671434, 21695.04004042513770400546, 25461.54094471308053471148, 29529.35912535542229306884, 33898.49732395477622048929, 38568.96267243868351215497, 43540.73737067681213375181, 48813.83598593100032303482, 54388.26309089270944241434, 60263.99821297605376457796, 66441.06666852386842947453, 72919.43829383446427527815, 79699.13774600370379630476, 86780.1601455444615567103, 94162.5, 101846.16375011176569387317, 109831.13192875118693336844, 118117.43649783376895356923, 126705.06981690699467435479, 135593.98925991670694202185, 144784.26340514124603942037, 154275.85066818533232435584, 164068.72137551411287859082, 174162.94947195050190202892, 184558.50630397000350058079, 195255.3439005852269474417, 206253.54157317758654244244, 217553.05234919124632142484, 229153.87622873796499334276, 241055.99283395300153642893, 253259.45755396070308052003, 265764.26663444918813183904, 278570.33450410899240523577, 291677.75316816673148423433, 305086.51619995082728564739, 318796.55095885053742676973, 332807.93919183709658682346, 347120.64054990757722407579, 361734.64219808444613590837, 376650., 391866.67093395174015313387, 407384.65494278055848553777, 423203.98327603936195373535, 439324.5276509835384786129, 455746.48028013715520501137, 472469.7459840854280628264, 489494.35605599009431898594, 506820.27921699441503733397, 524447.48420287587214261293, 542375.95696841005701571703, 560605.84875011176336556673, 579137.05360624345485121012, 597969.57156601105816662312, 617103.4026294144568964839, 636538.54676724784076213837, 656274.88542415446136146784, 676312.71635754744056612253, 696651.79786656249780207872, 717292.25496423663571476936, 738234.0251795558724552393, 759477.10846960206981748343, 781021.37551698694005608559, 802867.08310341229662299156, 825014.16626411862671375275, 847462.5, 870212.2093676798976957798, 893263.1693105349550023675, 916615.50482767110224813223, 940269.0114872597623616457, 964223.9713004769291728735, 988480.24418802536092698574, 1013037.83019400970079004765, 1037896.79178877954836934805, 1063057.06645730882883071899, 1088518.43900908948853611946, 1114281.33797362539917230606, 1140345.48751452844589948654, 1166711.01265802420675754547, 1193377.91340500675141811371, 1220346.06472656829282641411, 1247615.42816808237694203854, 1275186.20378602296113967896, 1303058.35497854277491569519, 1331231.7567602966446429491, 1359706.53415958862751722336, 1388482.56213366100564599037, 1417559.91646490828134119511, 1446938.56873535970225930214, 1476618.59658039035275578499, 1506600.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_AirTemperatureEnthalpyInversion.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Air_Examples_PerfectGasTemperatureEnthalpyInversion.txt
similarity index 100%
rename from BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Examples_AirTemperatureEnthalpyInversion.txt
rename to BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Air_Examples_PerfectGasTemperatureEnthalpyInversion.txt
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Air_Examples_PerfectGasTestImplementation.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Air_Examples_PerfectGasTestImplementation.txt
new file mode 100644
index 00000000..5ac52c5b
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Air_Examples_PerfectGasTestImplementation.txt
@@ -0,0 +1,11 @@
+last-generated=2017-03-31
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "3",
+ "linear": "0"
+}
+volume.medium.T=[2.931499938964844e+02, 3.040000306654449e+02, 3.093740236200287e+02, 3.130481569544895e+02, 3.16102386729095e+02, 3.188483884742873e+02, 3.213799136545289e+02, 3.23729156426174e+02, 3.259114993966388e+02, 3.279378044725977e+02, 3.298174130584126e+02, 3.315592347182571e+02, 3.331717533423562e+02, 3.346632086860031e+02, 3.360415038266876e+02, 3.373142692850248e+02, 3.384887088960887e+02, 3.395717161212019e+02, 3.405697930105394e+02, 3.414890749155598e+02, 3.42335326904557e+02, 3.431140141572895e+02, 3.438302002764756e+02, 3.44488677712971e+02, 3.450938418611616e+02, 3.456498413085938e+02, 3.461604924058183e+02, 3.4662927197505e+02, 3.47059661815667e+02, 3.474545596390192e+02, 3.478168025614222e+02, 3.481491393277904e+02, 3.484537965935374e+02, 3.487331844606968e+02, 3.48989318759199e+02, 3.492240601913797e+02, 3.494392392048764e+02, 3.496364134834877e+02, 3.498171387535838e+02, 3.499826662402334e+02, 3.501343382916859e+02, 3.502732849592575e+02, 3.504005433711606e+02, 3.505170897633145e+02, 3.506238098386092e+02, 3.507215577277818e+02, 3.508110656017599e+02, 3.508930053803524e+02, 3.509680176544132e+02, 3.510366820657511e+02, 3.510995483398438e+02, 3.511571045442824e+02, 3.512098084447773e+02, 3.512580262540119e+02, 3.513021849672456e+02, 3.51342620803044e+02, 3.51379638663362e+02, 3.514135132066218e+02, 3.514445496096951e+02, 3.514729614962113e+02, 3.514989623423181e+02, 3.515227660803217e+02, 3.515445556540218e+02, 3.515644836516001e+02, 3.515827331791803e+02, 3.515994568249437e+02, 3.516147460549334e+02, 3.516287231221217e+02, 3.516415405185036e+02, 3.516532592799995e+02, 3.516640014770308e+02, 3.516738281449722e+02, 3.516828307856635e+02, 3.516910400239288e+02, 3.516985778740201e+02, 3.517054748535156e+02, 3.517117919980082e+02, 3.517175903425085e+02, 3.51722869887453e+02, 3.51727722157819e+02, 3.517321472117038e+02, 3.517362060537416e+02, 3.517398986841508e+02, 3.517433166557383e+02, 3.517463989337847e+02, 3.517492675715768e+02, 3.517518615687732e+02, 3.51754241942268e+02, 3.517564392099302e+02, 3.517584228544001e+02, 3.517602539102517e+02, 3.51761932368645e+02, 3.517634582494066e+02, 3.517648620595646e+02, 3.517661437991192e+02, 3.517673034682521e+02, 3.517683715843231e+02, 3.51769348141912e+02, 3.517702636701288e+02, 3.517710571281787e+02, 3.517718200683594e+02]
+time=[0e+00, 1e+00]
+volume.medium.X[1]=[9.999999776482582e-03, 9.609200983508996e-03, 9.255277909158784e-03, 8.927666561141802e-03, 8.62293594701952e-03, 8.339419981489789e-03, 8.075901273368288e-03, 7.831273607532064e-03, 7.604464849845416e-03, 7.394426575092336e-03, 7.200133549158853e-03, 7.020589885346838e-03, 6.85483399268916e-03, 6.70194246384362e-03, 6.561031573195719e-03, 6.431261617992582e-03, 6.311833817878392e-03, 6.201994624348439e-03, 6.101033720127683e-03, 6.008284145450447e-03, 5.923121260783238e-03, 5.844960406198601e-03, 5.773253265105099e-03, 5.707490750074292e-03, 5.647201991690783e-03, 5.591947585344315e-03, 5.541327829330904e-03, 5.494976929890497e-03, 5.452524409856375e-03, 5.413669130769856e-03, 5.378115031793335e-03, 5.345578312906148e-03, 5.315825322959863e-03, 5.288603284370239e-03, 5.26371180007033e-03, 5.240951186230939e-03, 5.220138496561941e-03, 5.201115281688855e-03, 5.183720953357189e-03, 5.16782559163813e-03, 5.153296058037309e-03, 5.14001864490372e-03, 5.127888623459117e-03, 5.116802182243514e-03, 5.106677298942102e-03, 5.097426463652764e-03, 5.088977056832408e-03, 5.081259644650673e-03, 5.074211389115194e-03, 5.067772703577044e-03, 5.061893723905087e-03, 5.056524644415277e-03, 5.051621692713376e-03, 5.047143890499523e-03, 5.043054473662568e-03, 5.039318003328835e-03, 5.035904702583537e-03, 5.032788494352882e-03, 5.02994143885812e-03, 5.027341184271393e-03, 5.024966789278237e-03, 5.022798202197481e-03, 5.020817742662038e-03, 5.019009578157055e-03, 5.017358807471377e-03, 5.01585099505292e-03, 5.014474041515168e-03, 5.013217220240806e-03, 5.012069829599329e-03, 5.01102115935281e-03, 5.0100642245642e-03, 5.009190177634046e-03, 5.008391572504729e-03, 5.007662811726354e-03, 5.00699691535721e-03, 5.006388761103153e-03, 5.00583369234687e-03, 5.005326586791996e-03, 5.00486371913491e-03, 5.004440900812631e-03, 5.00405533283376e-03, 5.003702826879009e-03, 5.003381054630277e-03, 5.003087222113741e-03, 5.002819466664266e-03, 5.002574530059469e-03, 5.002350546729368e-03, 5.002146586869037e-03, 5.001959856515194e-03, 5.001789424338602e-03, 5.001634359004476e-03, 5.001492333021267e-03, 5.001362413377782e-03, 5.001244135282577e-03, 5.001136101757897e-03, 5.001037847139679e-03, 5.000947974437401e-03, 5.000866018462165e-03, 5.000791512567379e-03, 5.000723525943939e-03, 5.000661127269268e-03]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Air_Examples_TestPerfectGas.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Air_Examples_TestPerfectGas.txt
new file mode 100644
index 00000000..002c83ac
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Air_Examples_TestPerfectGas.txt
@@ -0,0 +1,4 @@
+last-generated=2012-03-08
+volume.medium.T=[293.14999389648437500000, 304.00485244206561219471, 309.36361712609954111031, 313.04730246333542709181, 316.10284449175736654070, 318.84176616010705629378, 321.37609895765211831531, 323.72775261753474751458, 325.91079749231465712000, 327.93633962922973523746, 329.81515475769958811725, 331.55618296039006054343, 333.16845744416428942714, 334.66027899835762582370, 336.03836051614069901916, 337.31121752757610465778, 338.48507730412813998555, 339.56768780102578375590, 340.56329276847242226722, 341.47897359621816804065, 342.32104467922232515775, 343.09579516114803254823, 343.80697639879491589454, 344.45962498082423053347, 345.06036407640323204760, 345.61486816406250000000, 346.12292526278088189429, 346.58746289711149302093, 347.01513666940093116864, 347.41027863532445962846, 347.77206379480134046389, 348.10232536334677888590, 348.40625020703697600766, 348.68691980925797224700, 348.94378653290931424635, 349.17816175378874277158, 349.39373749436407479152, 349.59277334545930671084, 349.77484139044810262931, 349.94085715929350044462, 350.09353628891420839864, 350.23446660086472093099, 350.36389176223349295469, 350.48239127545838300648, 350.59127810087369425673, 350.69140636332281246723, 350.78341667381408797155, 350.86798096659913426265, 350.94549568421263074924, 351.01635735682805261604, 351.08160400390625000000, 351.14190679314106091624, 351.19750986661358638230, 351.24877943700755622558, 351.29614247957380257503, 351.33984369943294723271, 351.38018797896791056701, 351.41738894133550275001, 351.45047002188863416450, 351.47991950642483516276, 351.50656121817985422240, 351.53063961547798044194, 351.55249022433434902268, 351.57229615152738233519, 351.59036257327494467972, 351.60653690015840311389, 351.62063595071293775618, 351.63333127845578474080, 351.64486693539231509931, 351.65542602779174785610, 351.66522217924631377173, 351.67453004861420140514, 351.68313596537370813166, 351.69003294617891697271, 351.69635009183559759549, 351.70217895507812500000, 351.70764160665555664309, 351.71289063489513182503, 351.71807862812397615926, 351.72326659043045538056, 351.72714232943695833455, 351.73071288982464466244, 351.73410034408874480505, 351.73730469284771515959, 351.74041748847218968876, 351.74346923100540607265, 351.74655150930635727491, 351.74929809446621220559, 351.75180053827352821827, 351.75415039389912408296, 351.75634766097931560580, 351.75836181120405399270, 351.76022338561602964546, 351.76190185437735635787, 351.76351928750955266878, 351.76504516783455756013, 351.76644897755608099033, 351.76773070939822218861, 351.76885986124403871145, 351.76986694248626008630, 351.77075195312500000000]
+time=[0.00000000000000000000, 0.01000000000000000021, 0.02000000000000000042, 0.02999999999999999889, 0.04000000000000000083, 0.05000000000000000278, 0.05999999999999999778, 0.07000000000000000666, 0.08000000000000000167, 0.08999999999999999667, 0.10000000000000000555, 0.11000000000000000056, 0.11999999999999999556, 0.13000000000000000444, 0.14000000000000001332, 0.14999999999999999445, 0.16000000000000000333, 0.17000000000000001221, 0.17999999999999999334, 0.19000000000000000222, 0.20000000000000001110, 0.20999999999999999223, 0.22000000000000000111, 0.23000000000000000999, 0.23999999999999999112, 0.25000000000000000000, 0.26000000000000000888, 0.27000000000000001776, 0.28000000000000002665, 0.28999999999999998002, 0.29999999999999998890, 0.30999999999999999778, 0.32000000000000000666, 0.33000000000000001554, 0.34000000000000002442, 0.34999999999999997780, 0.35999999999999998668, 0.36999999999999999556, 0.38000000000000000444, 0.39000000000000001332, 0.40000000000000002220, 0.40999999999999997558, 0.41999999999999998446, 0.42999999999999999334, 0.44000000000000000222, 0.45000000000000001110, 0.46000000000000001998, 0.46999999999999997335, 0.47999999999999998224, 0.48999999999999999112, 0.50000000000000000000, 0.51000000000000000888, 0.52000000000000001776, 0.53000000000000002665, 0.54000000000000003553, 0.55000000000000004441, 0.56000000000000005329, 0.56999999999999995115, 0.57999999999999996003, 0.58999999999999996891, 0.59999999999999997780, 0.60999999999999998668, 0.61999999999999999556, 0.63000000000000000444, 0.64000000000000001332, 0.65000000000000002220, 0.66000000000000003109, 0.67000000000000003997, 0.68000000000000004885, 0.68999999999999994671, 0.69999999999999995559, 0.70999999999999996447, 0.71999999999999997335, 0.72999999999999998224, 0.73999999999999999112, 0.75000000000000000000, 0.76000000000000000888, 0.77000000000000001776, 0.78000000000000002665, 0.79000000000000003553, 0.80000000000000004441, 0.81000000000000005329, 0.81999999999999995115, 0.82999999999999996003, 0.83999999999999996891, 0.84999999999999997780, 0.85999999999999998668, 0.86999999999999999556, 0.88000000000000000444, 0.89000000000000001332, 0.90000000000000002220, 0.91000000000000003109, 0.92000000000000003997, 0.93000000000000004885, 0.93999999999999994671, 0.94999999999999995559, 0.95999999999999996447, 0.96999999999999997335, 0.97999999999999998224, 0.98999999999999999112, 1.00000000000000000000]
+volume.medium.X[1]=[0.00999999977648258209, 0.00960917956309186201, 0.00925530584883581427, 0.00892767494304185123, 0.00862293501569902712, 0.00833943581397251707, 0.00807591431188370810, 0.00783128292075794923, 0.00760447509439540238, 0.00739445591174344406, 0.00720019222247723738, 0.00702070583501181872, 0.00685501187530903038, 0.00670218507342537802, 0.00656136778064085342, 0.00643164904811284553, 0.00631233021283814002, 0.00620253572275096879, 0.00610187004754822286, 0.00600953956839316104, 0.00592486003988432815, 0.00584714668618523201, 0.00577600578905597666, 0.00571089426816967765, 0.00565108746963569660, 0.00559597415849566460, 0.00554561843290733193, 0.00549971875834699784, 0.00545754842946404462, 0.00541864658400371350, 0.00538312275297728269, 0.00535078952833410639, 0.00532109567737130886, 0.00529371345170047327, 0.00526871998719867160, 0.00524598079378266018, 0.00522510477435428073, 0.00520585990468845194, 0.00518830073209121563, 0.00517233365841733832, 0.00515767979348761771, 0.00514417467177886566, 0.00513179784969739275, 0.00512049580773764161, 0.00511012784901998963, 0.00510061624315163390, 0.00509189069974218256, 0.00508389109655194189, 0.00507657229157206045, 0.00506989844756010506, 0.00506376707926392555, 0.00505810509853796622, 0.00505289481007336564, 0.00504809570123154663, 0.00504367194125894275, 0.00503959274390189740, 0.00503583205950542973, 0.00503236846762859617, 0.00502930208569304579, 0.00502659007238903839, 0.00502414536290065033, 0.00502194324810395932, 0.00501995720060198318, 0.00501816254028543407, 0.00501653319004228670, 0.00501508405118472351, 0.00501382723765736709, 0.00501270126731298300, 0.00501168379630055789, 0.00501075433546071831, 0.00500989239563799909, 0.00500907702200118019, 0.00500832172291862127, 0.00500772753839216333, 0.00500718690504696994, 0.00500668818131089211, 0.00500621832863679811, 0.00500576523978237074, 0.00500531587619825694, 0.00500486139304000006, 0.00500453170426961528, 0.00500422529883337661, 0.00500393798554821592, 0.00500366277948039676, 0.00500339548965224139, 0.00500312959839165419, 0.00500285998025761652, 0.00500262295838038544, 0.00500240596001400202, 0.00500220339717305940, 0.00500201433853720429, 0.00500183925077190335, 0.00500167859743849263, 0.00500153144831682987, 0.00500139221545758961, 0.00500126043319615559, 0.00500113982682782055, 0.00500103039696985809, 0.00500093260797740153, 0.00500084599487804309, 0.00500077055767178535]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Water_Examples_TemperatureDependentDensityDerivativeCheck.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Water_Examples_TemperatureDependentDensityDerivativeCheck.txt
new file mode 100644
index 00000000..29612476
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Water_Examples_TemperatureDependentDensityDerivativeCheck.txt
@@ -0,0 +1,15 @@
+last-generated=2015-08-19
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "3",
+ "linear": " "
+}
+der(hLiqCod)=[0., 338.90400836442518084368, 1355.61603042767865190399, 3050.13612722473408211954, 5422.46411565064317983342, 8472.59936192208806460258, 12200.54449980935532948934, 16606.29673561788513325155, 21689.85645048016522196122, 27451.22245199274402693845, 33890.39743759045813931152, 41007.38326094488002127036, 48802.17798105507245054469, 57274.78157771079713711515, 66425.18693843342771288007, 76253.39241783888428471982, 86759.42577769003401044756, 97943.2557641975290607661, 109804.88975948176812380552, 122344.34683659233269281685, 135561.58973016380332410336, 149456.66562696974142454565, 164029.53303570498246699572, 179280.21227381480275653303, 195208.71188784288824535906, 211815., 229099.12624620954738929868, 247060.99606310258968733251, 265700.74774564517429098487, 285018.26645913731772452593, 305013.56959061004454270005, 325686.74500648200046271086, 347037.70306225691456347704, 369066.4395080205867998302, 391773.02303256647428497672, 415157.42043056810507550836, 439219.55894103244645521045, 463959.55057380528887733817, 489377.38731407112209126353, 515473.00666183006251230836, 542246.35888032906223088503, 569697.63496270985342562199, 597826.66241916129365563393, 626633.47920174640603363514, 656118.13212668942287564278, 686280.66144108842127025127, 717120.84903854178264737129, 748638.94130571151617914438, 780834.84747861686628311872, 813708.46839082683436572552, 847260., 881489.34553084487561136484, 916396.5048544927267357707, 951981.41547183739021420479, 988243.9841084042564034462, 1025184.58064073929563164711, 1062802.99096620385535061359, 1101099.15268171648494899273, 1140073.06572239589877426624, 1179724.98005483532324433327, 1220054.27820220519788563251, 1261061.69095216807909309864, 1302746.97999403951689600945, 1345110.02039368194527924061, 1388150.81215109536424279213, 1431869.4802019074559211731, 1476265.75785680231638252735, 1521339.92432364798150956631, 1567092.09208225319162011147, 1613522.01116677559912204742, 1660629.68164058984257280827, 1708415.2284067946020513773, 1756878.23557219468057155609, 1806019.28075592312961816788, 1855838.20223126211203634739, 1906335., 1957509.54919088073074817657, 2009361.97467396827414631844, 2061892.0264510507695376873, 2115099.63524899445474147797, 2168985.43544181203469634056, 2223549.23692614911124110222, 2278790.53980151982977986336, 2334709.84400089364498853683, 2391306.64949575299397110939, 2448581.36280137067660689354, 2506533.91671166755259037018, 2565164.47191357472911477089, 2624472.52847384894266724586, 2684458.58639070205390453339, 2745122.64559976151213049889, 2806463.83841752354055643082, 2868483.39604202099144458771, 2931180.70496200304478406906, 2994555.76520683057606220245, 3058608.57684100698679685593, 3123339.38976754574105143547, 3188747.56209119316190481186, 3254833.87343525560572743416, 3321597.93607152439653873444, 3389040.]
+der(hLiqSym)=[0., 338.90400836442518084368, 1355.61603042767865190399, 3050.13612722473408211954, 5422.46411565064317983342, 8472.59936192208806460258, 12200.54449980935532948934, 16606.29673561788513325155, 21689.85645048016522196122, 27451.22245199274402693845, 33890.39743759045813931152, 41007.38326094488002127036, 48802.17798105507245054469, 57274.78157771079713711515, 66425.18693843342771288007, 76253.39241783888428471982, 86759.42577769003401044756, 97943.2557641975290607661, 109804.88975948176812380552, 122344.34683659233269281685, 135561.58973016380332410336, 149456.66562696974142454565, 164029.53303570498246699572, 179280.21227381480275653303, 195208.71188784288824535906, 211815., 229099.12624620954738929868, 247060.99606310258968733251, 265700.74774564517429098487, 285018.26645913731772452593, 305013.56959061004454270005, 325686.74500648200046271086, 347037.70306225691456347704, 369066.4395080205867998302, 391773.02303256647428497672, 415157.42043056810507550836, 439219.55894103244645521045, 463959.55057380528887733817, 489377.38731407112209126353, 515473.00666183006251230836, 542246.35888032906223088503, 569697.63496270985342562199, 597826.66241916129365563393, 626633.47920174640603363514, 656118.13212668942287564278, 686280.66144108842127025127, 717120.84903854178264737129, 748638.94130571151617914438, 780834.84747861686628311872, 813708.46839082683436572552, 847260., 881489.34553084487561136484, 916396.5048544927267357707, 951981.41547183739021420479, 988243.9841084042564034462, 1025184.58064073929563164711, 1062802.99096620385535061359, 1101099.15268171648494899273, 1140073.06572239589877426624, 1179724.98005483532324433327, 1220054.27820220519788563251, 1261061.69095216807909309864, 1302746.97999403951689600945, 1345110.02039368194527924061, 1388150.81215109536424279213, 1431869.4802019074559211731, 1476265.75785680231638252735, 1521339.92432364798150956631, 1567092.09208225319162011147, 1613522.01116677559912204742, 1660629.68164058984257280827, 1708415.2284067946020513773, 1756878.23557219468057155609, 1806019.28075592312961816788, 1855838.20223126211203634739, 1906335., 1957509.54919088073074817657, 2009361.97467396827414631844, 2061892.0264510507695376873, 2115099.63524899445474147797, 2168985.43544181203469634056, 2223549.23692614911124110222, 2278790.53980151982977986336, 2334709.84400089364498853683, 2391306.64949575299397110939, 2448581.36280137067660689354, 2506533.91671166755259037018, 2565164.47191357472911477089, 2624472.52847384894266724586, 2684458.58639070205390453339, 2745122.64559976151213049889, 2806463.83841752354055643082, 2868483.39604202099144458771, 2931180.70496200304478406906, 2994555.76520683057606220245, 3058608.57684100698679685593, 3123339.38976754574105143547, 3188747.56209119316190481186, 3254833.87343525560572743416, 3321597.93607152439653873444, 3389040.]
+der(cvCod)=[0., 0.]
+der(cpSym)=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
+time=[0., 1.]
+der(cpCod)=[0., 0.]
+der(cvSym)=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Water_Examples_TemperatureDependentDensityProperties.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Water_Examples_TemperatureDependentDensityProperties.txt
new file mode 100644
index 00000000..d46a1258
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Water_Examples_TemperatureDependentDensityProperties.txt
@@ -0,0 +1,24 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+p=[300000., 300000.]
+time=[0., 1.]
+X[1]=[1., 1.]
+d=[1000.26214599609375, 1000.21929931544445935288, 1000.17639159965256112628, 1000.13354491901009168942, 1000.09069823836762225255, 1000.04785156568323145621, 999.99938964102966565406, 999.93981933783834392671, 999.86914061119387042709, 999.78759768691804765695, 999.6951294089467410231, 999.59191893878232804127, 999.47802731149943156197, 999.35357659772864735714, 999.21856690282584168017, 999.07318124147400340007, 998.91748041079711128987, 998.75152590930144924641, 998.57543958190922239737, 998.38928218079684029362, 998.19317632919398874947, 997.98724351328223747259, 997.77148434858827386051, 997.54602060356387482898, 997.31097399192753982788, 997.06646728515625, 996.81249975232685756055, 996.54919462242776262428, 996.27661136104859451734, 995.99493384239804072422, 995.70416294872052276332, 995.40448005279165499815, 995.09588600586039319751, 994.77850383855457039317, 994.4523926959952859761, 994.1176755787969341327, 993.7744755935844978012, 993.42285173173843304539, 993.06286603689693492925, 992.69457954465292459645, 992.31817649581307705375, 991.93371568116003800242, 991.54132027975094842986, 991.14093046456343927275, 990.73284902265027085377, 990.31695506545759144501, 989.89349400835567394097, 989.46252436214865610964, 989.02410841163600707659, 988.57830853329414821928, 988.12530517578125, 987.6650996547034537798, 987.19781404211312292318, 986.72350937316650743014, 986.24237164336648220342, 985.75433408107085142547, 985.25964367328708704008, 984.75830042000484354503, 984.2504874271397738994, 983.73614366055085156404, 983.21545534936808508064, 982.68853835507059102383, 982.155395763194292158, 981.61621067862586187402, 981.07098310180174394191, 980.51989613819080204848, 979.96295312638244467962, 979.40026949741741191247, 978.83197062301803725859, 978.25811753819107252639, 977.67883231333405547048, 977.09417598490063028294, 976.5042131195955334988, 975.90905875629209731414, 975.30883846512483614788, 974.70361328125, 974.0934442395326868791, 973.47845341115851169889, 972.8587018330300679736, 972.23437634370111481985, 971.60540846680123650003, 970.9720460498521106274, 970.33428909262192973983, 969.69219863137186621316, 969.04595777112956511701, 968.39557040250201680465, 967.74121187564605861553, 967.08288605679456395592, 966.42071501524139875983, 965.75488185645531302725, 965.08532554702628658561, 964.41217217971188802039, 963.73559683480823423452, 963.05560351475185143499, 962.3723142897777051985, 961.68585123043089879502, 960.99627537163507895457, 960.30365188690041122754, 959.60809459057713866059, 958.9096686357985390714, 958.20849609375]
+eta=[0.00175407878123223782, 0.00170769111615303695, 0.00166130740919493433, 0.00161492766035797181, 0.00156855186964212768, 0.00152218004568442406, 0.00147680506914329231, 0.00143335235898070382, 0.00139172560741223587, 0.00135183370677766025, 0.00131359068305838666, 0.00127691554158070476, 0.00124173156462182221, 0.00120796645817608929, 0.00117555202640679977, 0.00114442340061295567, 0.00111451953536743269, 0.00108578254508828417, 0.00105815790210257938, 0.00103159352983979305, 0.00100604049679923905, 0.00098145216059257879, 0.00095778458941627462, 0.00093499601125350735, 0.00091304657993626192, 0.00089189893333241343, 0.00087151715260395631, 0.00085186756663758968, 0.00083291775303954529, 0.00081463721251945592, 0.00079699695088009082, 0.00077996921427362384, 0.00076352768823001016, 0.00074764750623250442, 0.0007323046501830383, 0.00071747664194694535, 0.00070314175376963504, 0.00068927946919862602, 0.00067587015756341454, 0.00066289513414614443, 0.00065033662406126821, 0.00063817755591137094, 0.00062640166956348263, 0.0006149935733072684, 0.00060393835624913093, 0.00059322196667614441, 0.00058283093077742334, 0.00057275220633784085, 0.00056297348480321985, 0.00055348309418455221, 0.00054426956921815872, 0.00053532217023575005, 0.00052663047798456701, 0.00051818471354926577, 0.0005099753208471329, 0.00050199312167573844, 0.00049422949269938975, 0.00048667599381239913, 0.00047932462141648711, 0.00047216769206864844, 0.00046519782525088129, 0.00045840789477430806, 0.00045179107422295683, 0.00044534084433436448, 0.00043905091866137686, 0.0004329152144710938, 0.00042692803353656288, 0.00042108362924587632, 0.00041537671172212862, 0.00040980210047461253, 0.00040435481874521052, 0.00039903003526547617, 0.00039382321141084853, 0.00038872983221899601, 0.0003837455926090951, 0.00037886644713580608, 0.00037408835037391186, 0.00036940748969081446, 0.00036482016888963765, 0.00036032283471965521, 0.00035591202844154947, 0.00035158440107439722, 0.00034733680940577061, 0.00034316613930883281, 0.00033906939307683888, 0.00033504371320334202, 0.0003310863159480973, 0.00032719448975234919, 0.00032336567347728283, 0.00031959736418536044, 0.00031588711714240341, 0.00031223268385903279, 0.0003086316924685266, 0.00030508204033670325, 0.00030158163198385954, 0.0002981284301404108, 0.00029472048483694462, 0.00029135592424670448, 0.00028803287471873979, 0.00028474963931008067, 0.00028150450089015067]
+h=[0., 4184.00009351965036330512, 8368.00018703930072661024, 12552.00028055869006493594, 16736.00037407903801067732, 20919.99968826746771810576, 25104.00056111855519702658, 29287.99987530675934976898, 33472.00074815668631345034, 37655.99850368663464905694, 41839.9993765360995894298, 46024.00024938556452980265, 50208.00112223502219421789, 54392.00199508449441054836, 58575.99975061444274615496, 62759.99750614438380580395, 66944.00149630638770759106, 71127.9992518468206981197, 75311.99700738723913673311, 79496.0009975375869544223, 83679.99875307801994495094, 87864.00274322836776264012, 92048.00049876880075316876, 96231.99825430921919178218, 100416.00224445956700947136, 104600., 108784.00399015036236960441, 112967.99551108086598105729, 117151.99950123121379874647, 121336.00349138154706452042, 125519.9950123120506759733, 129703.9990024624130455777, 133888.00299261277541518211, 138071.99451354326447471976, 142255.9985036936413962394, 146440.00249384396011009812, 150623.99401477447827346623, 154807.99800492482609115541, 158992.00199507517390884459, 163176.00598522552172653377, 167359.99750615603988990188, 171544.0014963063586037606, 175728.00548645673552528024, 179911.99700738722458481789, 184096.00099753760150633752, 188280.0049876879493240267, 192463.99650861843838356435, 196648.00049876878620125353, 200832.00448891913401894271, 205015.99600984965218231082, 209200., 213384.00399009088869206607, 217568.0079801818064879626, 221752.01197027269518002868, 225935.99102229549316689372, 230119.99501238641096279025, 234303.99900244755554012954, 238488.00299256815924309194, 242672.00698265904793515801, 246856.01097274993662722409, 251039.99002477276371791959, 255223.99401486365240998566, 259407.99800495454110205173, 263592.00199508271180093288, 267776.00598524807719513774, 271960.00997541350079700351, 276143.98902704514330253005, 280327.99301721056690439582, 284511.99700737599050626159, 288696.00099757104180753231, 292880.0049877067212946713, 297064.00897787214489653707, 301247.98802950378740206361, 305431.99201966921100392938, 309615.99600983457639813423, 313800., 317984.00399016542360186577, 322168.00798033078899607062, 326352.01197049621259793639, 330535.99102212785510346293, 334719.9950122932787053287, 338903.99900242895819246769, 343088.00299262400949373841, 347272.00698278943309560418, 351456.01097295485669746995, 355639.99002458649920299649, 359823.99401475192280486226, 364007.99800491728819906712, 368192.00199508271180093288, 372376.00598524807719513774, 376560.00997541350079700351, 380743.98902704514330253005, 384927.99301721056690439582, 389111.99700737599050626159, 393296.00099757104180753231, 397480.0049877067212946713, 401664.00897787214489653707, 405847.98802950378740206361, 410031.99201966921100392938, 414215.99600983457639813423, 418400.]
+u=[-299.92138671875, 3884.06576734752979973564, 8068.05292141386416915338, 12252.04031962053522875067, 16436.02771782729178084992, 20620.0133601439229096286, 24804.00056111593585228547, 28987.98229718234142637812, 33171.96168565319385379553, 37355.93600369361956836656, 41539.90953278900997247547, 45723.87915563323622336611, 49907.84487222454481525347, 54091.80668256586795905605, 58275.7653756167710525915, 62459.72016241766687016934, 66643.67337130638770759106, 70827.62425185380561742932, 75011.56731991517881397158, 79195.51662252827372867614, 83379.45187810130300931633, 87563.40118067714502103627, 91747.32862376414414029568, 95931.26387932551733683795, 100115.18974443861225154251, 104299.1171875, 108483.04305261310946661979, 112666.95644866468501277268, 116850.87450124052702449262, 121034.80036631635448429734, 125218.69813740518293343484, 129402.61618998103949707001, 133586.51861755689606070518, 137770.41638864570995792747, 141954.32662872158107347786, 146138.22124379739398136735, 150322.11901488623698242009, 154506.01362996207899414003, 158689.90824503792100585997, 162873.80286000200430862606, 167057.66938124917214736342, 171241.56399627841892652214, 175425.44298635429004207253, 179609.30950749898329377174, 183793.18849751897505484521, 187977.06748759481706656516, 192160.93400868363096378744, 196344.81299875015974976122, 200528.67636375149595551193, 204712.5272599986637942493, 208896.390625, 213080.25399001638288609684, 217264.11735488378326408565, 221447.98071982566034421325, 225631.80352263076929375529, 229815.6668874795432202518, 233999.51462748483754694462, 238183.36236745640053413808, 242367.21010739827761426568, 246551.05784734018379822373, 250734.86502514526364393532, 254918.71276508716982789338, 259102.54488002904690802097, 263286.37699500820599496365, 267470.22473480110056698322, 271654.04122504097176715732, 275837.86402745492523536086, 280021.68051773210754618049, 284205.4970075995079241693, 288389.34474749653600156307, 292573.16123733419226482511, 296756.97772720159264281392, 300940.76928039785707369447, 305124.58577026525745168328, 309308.40226013259962201118, 313492.21875, 317676.03523986740037798882, 321859.82048003276577219367, 326043.63697004917776212096, 330227.42852279840735718608, 334411.21376266580773517489, 338595.03025250346399843693, 342778.8467424004920758307, 346962.63198226789245381951, 351146.41722254507476463914, 355330.20877495902823284268, 359513.99401519889943301678, 363697.77925506629981100559, 367881.56449500820599496365, 372065.38098480110056698322, 376249.16622466844273731112, 380432.92652786470716819167, 384616.71176773210754618049, 388800.4970075995079241693, 392984.28224749653600156307, 397168.06748733419226482511, 401351.82147753686876967549, 405535.58178039785707369447, 409719.36702026525745168328, 413903.15225998358801007271, 418086.90625]
+s=[0., 15.2896207404766162341, 30.52357169392974256539, 45.70225626462080725787, 60.82607785681546630485, 75.89542276802337994468, 90.9106923169919269867, 105.87226823150483312475, 120.78053549702379143582, 135.63585895269517322959, 150.43864220651303753584, 165.18922512051088347107, 179.88800442248813737933, 194.53531580758905761286, 209.13151463414121167261, 223.67697803664603384277, 238.17206327855498670942, 252.61709336787114921208, 267.01241037218903784378, 281.3584018508266808567, 295.6553607352630024252, 309.90363481110142629404, 324.10354783188836336194, 338.25542623230023764336, 352.35962669136205249742, 366.416412353515625, 380.42613027725229812859, 394.38908416040919746592, 408.30560137057523206749, 422.17600642446109304728, 436.00056337561966302019, 449.77959876994947308049, 463.51340702065698451406, 477.20225258108979460303, 490.84652222638294460921, 504.44641922311524240286, 518.00217789910232113471, 531.5142757918641791548, 544.98279449589767864381, 558.4081612577331270586, 571.79051937750205070188, 585.13025378496001849271, 598.42756867322282232635, 611.68272978911875270569, 624.89612130836121650646, 638.06788676576718444267, 651.1982312443363980492, 664.28759921366554408451, 677.33607354383354959282, 690.34398175085846105503, 703.3116455078125, 716.23920908310810773401, 729.12697766027793022658, 741.97513434653694730514, 754.7839080959520288161, 767.55363469839630852221, 780.284542866798005889, 792.9768157020946546254, 805.63069734929706555704, 818.24643195108478721522, 830.82412776387116082333, 843.36423989561217240407, 855.86687636982139792963, 868.33228132392252973659, 880.76063786425743273867, 893.15219013567104866524, 905.50704771550442728767, 917.82566305945351814444, 930.10808448706245599169, 942.35455613736962732219, 954.56526111260018296889, 966.74050459468946883135, 978.88027536683296148112, 990.98502332581597329408, 1003.05485910819515993353, 1015.0899658203125, 1027.09058759668118909758, 1039.05678547973366221413, 1050.9889256821531944297, 1062.88718152974138320133, 1074.75157278730239340803, 1086.58251671367202106921, 1098.3801353767951241025, 1110.14442878093109356996, 1121.87588520770464128873, 1133.57443502999967677169, 1145.24046184552412341873, 1156.87401789622458636586, 1168.47522524921191688918, 1180.04445011629695727606, 1191.58181456982947565848, 1203.08737220127750333631, 1214.56138223858215496875, 1226.00402014503947611956, 1237.41540798973301207297, 1248.79591198146567876393, 1260.1454100558435129642, 1271.46420105007746315096, 1282.75241989888331772818, 1294.01036525198242088663, 1305.238037109375]
+g=[0., -7.64946689044124905621, -30.56068563657253633892, -68.67818767542217983646, -121.94691261667480830511, -190.3121740228846476839, -273.71973895553878719511, -372.11565851037107677257, -485.44652454879116021402, -613.65907067564955923444, -756.70066139694017692818, -914.51899186736579849821, -1087.06193829153517071973, -1274.27792548986303700076, -1476.11546613731843535788, -1692.52379332525651989272, -1923.4527224128407851822, -2168.85127344599868592923, -2428.66997606200220616302, -2702.8599307033382501686, -2991.37076192262247786857, -3294.15450099561076058308, -3611.16190403945211073733, -3942.3453184426994084788, -4287.65692805632079398492, -4647.048828125, -5020.47448522849754226627, -5407.88483227118194918148, -5809.23676789812179777073, -6224.48179875743153388612, -6653.57272408215976611245, -7096.46717824878396640997, -7553.11800829067487939028, -8023.47837994409110251581, -8507.50666088530124397948, -9005.15752804555631882977, -9516.38500311468487780076, -10041.14720813515668851323, -10579.39967457152306451462, -11131.099433534087438602, -11696.20083185855037299916, -12274.66524879824646632187, -12866.44805208457364642527, -13471.50542281493471818976, -14089.79897742618413758464, -14721.28591844867150939535, -15365.92035613004736660514, -16023.66707153252900752705, -16694.48314997801935533062, -17378.32551475374930305406, -18075.158203125, -18784.93623115267837420106, -19507.62443999823153717443, -20243.17790770284045720473, -20991.55697695015987847, -21752.73150841435926849954, -22526.65411114128073677421, -23313.28767745585355442017, -24112.59509662773416494019, -24924.53925856802015914582, -25749.07224095700803445652, -26586.1706703732670575846, -27435.79060811773524619639, -28297.89299276607562205754, -29172.44462106755963759497, -30059.40447611664058058523, -30958.73200350404295022599, -31870.40276717330198152922, -32794.37433561969373840839, -33730.60959996851306641474, -34679.07145186074922094122, -35639.72863950044120429084, -36612.53626545037695905194, -37597.4746746665914542973, -38594.49904457234515575692, -39603.57421875, -40624.66894937882170779631, -41657.74807780602714046836, -42702.77254153163084993139, -43759.70865937919734278694, -44828.52997024475189391524, -45909.20286621472769184038, -47001.68828644668974447995, -48105.95497966490802355111, -49221.96778900778008392081, -50349.68870643812260823324, -51489.09992593316565034911, -52640.16351141782070044428, -53802.84040146308689145371, -54977.10325220719823846593, -56162.92081240221887128428, -57360.25075410706631373614, -58569.08000617456855252385, -59789.36631142434634966776, -61021.08232654824678320438, -62264.18899002104444662109, -63518.66286263689835323021, -64784.46511561242368770763, -66061.57568058038305025548, -67349.95970452428446151316, -68649.59375]
+f=[-299.92138671875, -307.58371009293540510043, -330.50778341546242700133, -368.63812572560317448733, -421.91971382631345477421, -490.29781550141615298344, -573.71992206323807295121, -672.13372491604809511045, -785.48580067593070452858, -913.72279136960685264057, -1056.79221412694960235967, -1214.6414894279239433672, -1387.21855451229521349887, -1574.47201730536448849307, -1776.35008527543322998099, -1992.80211361083547672024, -2223.77791774258457735414, -2469.22627343683097933535, -2729.09795453921014996013, -3003.34381743605808878783, -3291.91373065479638171382, -3594.75948150677959347377, -3911.83207006293514496065, -4243.08335552355310937855, -4588.46601012686096510151, -4947.931640625, -5321.43346968033165467205, -5708.92389468212422798388, -6110.35786163822649541544, -6525.68785351827227714239, -6954.86715756822559342254, -7397.85243213291505526286, -7854.59652398377784265904, -8325.05308684728515800089, -8809.180488973630417604, -9306.93291873167436278891, -9818.26390921800157229882, -10343.13353620893394690938, -10881.49537774774580611847, -11433.30744150724058272317, -11998.52309741661156294867, -12577.10470196515416319016, -13169.0076225571447139373, -13774.18706335262322681956, -14392.60561808145212125964, -15024.21853579333219386172, -15668.98383258253488747869, -16326.86238404824507597368, -16997.81322823922528186813, -17681.79231148905091686174, -18378.76171875, -19088.68427815806353464723, -19811.51506527762467158027, -20547.21501749692833982408, -21295.74252348988738958724, -22057.06549261473992373794, -22831.14239235402783378959, -23617.93220881062370608561, -24417.39587813850084785372, -25229.49824337840618682094, -26054.19333431120321620256, -26891.45582638578343903646, -27741.24177991357282735407, -28603.51213347023440292105, -29478.23173069400945678353, -30365.36541401244539883919, -31264.86676866804918972775, -32176.71331373864086344838, -33100.86261674397246679291, -34037.27756876042258227244, -34985.92301457028952427208, -35946.76379608571733115241, -36919.75501489159069024026, -37904.88092433132260339335, -38902.09279440470709232613, -39911.359375, -40932.6455120837053982541, -41965.91995321580179734156, -43011.14363578453776426613, -44068.27506521010946016759, -45137.29950123864546185359, -46218.17161616816156310961, -47310.86016160035069333389, -48415.32998002346721477807, -49531.54982082122296560556, -50659.48167467590246815234, -51799.09992562583647668362, -52950.37444881537521723658, -54113.2661828155250987038, -55287.74387748658773489296, -56473.77628166443173540756, -57671.32106604362343205139, -58880.36906831601663725451, -60100.8741237706781248562, -61332.80888910412613768131, -62576.14211527715087868273, -63830.83864434789575170726, -65096.86745869188598589972, -66374.20849255885696038604, -67662.81907930076704360545, -68962.671875]
+hIse=[0., 4184.00009351965036330512, 8368.00018703930072661024, 12552.00028055869006493594, 16736.00037407903801067732, 20919.99968826746771810576, 25104.00056111855519702658, 29287.99987530675934976898, 33472.00074815668631345034, 37655.99850368663464905694, 41839.9993765360995894298, 46024.00024938556452980265, 50208.00112223502219421789, 54392.00199508449441054836, 58575.99975061444274615496, 62759.99750614438380580395, 66944.00149630638770759106, 71127.9992518468206981197, 75311.99700738723913673311, 79496.0009975375869544223, 83679.99875307801994495094, 87864.00274322836776264012, 92048.00049876880075316876, 96231.99825430921919178218, 100416.00224445956700947136, 104600., 108784.00399015036236960441, 112967.99551108086598105729, 117151.99950123121379874647, 121336.00349138154706452042, 125519.9950123120506759733, 129703.9990024624130455777, 133888.00299261277541518211, 138071.99451354326447471976, 142255.9985036936413962394, 146440.00249384396011009812, 150623.99401477447827346623, 154807.99800492482609115541, 158992.00199507517390884459, 163176.00598522552172653377, 167359.99750615603988990188, 171544.0014963063586037606, 175728.00548645673552528024, 179911.99700738722458481789, 184096.00099753760150633752, 188280.0049876879493240267, 192463.99650861843838356435, 196648.00049876878620125353, 200832.00448891913401894271, 205015.99600984965218231082, 209200., 213384.00399009088869206607, 217568.0079801818064879626, 221752.01197027269518002868, 225935.99102229549316689372, 230119.99501238641096279025, 234303.99900244755554012954, 238488.00299256815924309194, 242672.00698265904793515801, 246856.01097274993662722409, 251039.99002477276371791959, 255223.99401486365240998566, 259407.99800495454110205173, 263592.00199508271180093288, 267776.00598524807719513774, 271960.00997541350079700351, 276143.98902704514330253005, 280327.99301721056690439582, 284511.99700737599050626159, 288696.00099757104180753231, 292880.0049877067212946713, 297064.00897787214489653707, 301247.98802950378740206361, 305431.99201966921100392938, 309615.99600983457639813423, 313800., 317984.00399016542360186577, 322168.00798033078899607062, 326352.01197049621259793639, 330535.99102212785510346293, 334719.9950122932787053287, 338903.99900242895819246769, 343088.00299262400949373841, 347272.00698278943309560418, 351456.01097295485669746995, 355639.99002458649920299649, 359823.99401475192280486226, 364007.99800491728819906712, 368192.00199508271180093288, 372376.00598524807719513774, 376560.00997541350079700351, 380743.98902704514330253005, 384927.99301721056690439582, 389111.99700737599050626159, 393296.00099757104180753231, 397480.0049877067212946713, 401664.00897787214489653707, 405847.98802950378740206361, 410031.99201966921100392938, 414215.99600983457639813423, 418400.]
+beta=[0.00004284959140932187, 0.00004285142858866052, 0.00004285326576799917, 0.00004285510294733781, 0.00004285693648869765, 0.00004285877366769409, 0.00005403708350103662, 0.00006512713993084121, 0.00007612929234962608, 0.00008704387775830034, 0.00009787123256660772, 0.00010861167602386081, 0.00011926550644298498, 0.00012983303669291912, 0.00014031452821231099, 0.00015071029448287951, 0.00016102062730536472, 0.00017124572877615554, 0.00018138590535463149, 0.00019144139025474436, 0.00020141241543001996, 0.00021129921432564818, 0.00022110200486920244, 0.00023082100556780439, 0.00024045641990019792, 0.00025000845198519528, 0.00025947727579149048, 0.00026886303837015839, 0.00027816599939340747, 0.00028738627626279979, 0.00029652398740501304, 0.00030557936191582136, 0.00031455251793700937, 0.00032344351641619342, 0.00033225258498440228, 0.00034097978431166232, 0.00034962520517494984, 0.00035818904464322279, 0.00036667133501535351, 0.00037507216360304154, 0.00038339162217118601, 0.00039162981849608189, 0.00039978681496930922, 0.00040786261677058566, 0.00041585733022931091, 0.0004237710184577891, 0.00043160368735980993, 0.00043935538361408543, 0.0004470261710517704, 0.00045461602719602882, 0.00046212499728426337, 0.00046955311676165926, 0.00047690032743606697, 0.0004841666584117334, 0.00049135209621809959, 0.00049845663918899176, 0.00050548027335691544, 0.00051242299871015451, 0.0005192847570483929, 0.00052606549016852939, 0.00053276510018087351, 0.00053938366694727252, 0.00054592109207948466, 0.00055237731736193887, 0.00055875222637931322, 0.00056504581913882418, 0.00057125794244789981, 0.00057738855394801633, 0.00058343761635900118, 0.00058940501326238271, 0.00059529057002679503, 0.00060109428666339695, 0.00060681595469258348, 0.00061245558412499688, 0.00061801296597627827, 0.00062348804203793406, 0.00062888057946350025, 0.00063419057826768718, 0.00063941780562068353, 0.00064456211470498813, 0.0006496234504173486, 0.0006546016072240938, 0.00065949646869730945, 0.0006643077438066345, 0.00066903543255460217, 0.00067367927469102204, 0.00067823909274100506, 0.00068271480056054359, 0.00068710610710300652, 0.00069141283774499477, 0.00069563487607798662, 0.00069977196487224121, 0.00070382397882615382, 0.00070779060197983287, 0.00071167177611995485, 0.00071546715199179926, 0.0007191765549847465, 0.00072279978913842473, 0.00072633666482557963, 0.00072978692734842999, 0.00073315034387633204]
+kappa=[0., 0.]
+ddpT=[0., 0.]
+ddTp=[-0.04286082461476325989, -0.04286082461476325989, -0.04286082461476325989, -0.04286082461476325989, -0.04286082461476325989, -0.04286082461476325989, -0.0540370509043289482, -0.06512321498840567546, -0.07611933546222141023, -0.08702539263843066253, -0.09784139532149398188, -0.10856735024880941054, -0.11920325741876160175, -0.12974910938345782241, -0.14020489094139548802, -0.15057062487024810982, -0.16084631152927433839, -0.17103193518824447161, -0.18112751122031447992, -0.19113303958211477762, -0.20104849044103165201, -0.21087392315177699853, -0.22060927864089785455, -0.23025457160085163744, -0.23980983111325870905, -0.24927502870559692383, -0.25865016276464891654, -0.26793523630608956365, -0.27713030467520605171, -0.28623528043706758517, -0.29525019648197353694, -0.30417507674960547748, -0.31300989421424113557, -0.32175465276277220861, -0.33040937473106440914, -0.3389740338984917889, -0.34744860514853881384, -0.35583316881727805603, -0.3641276696874973795, -0.37233213756130595362, -0.38044648881056897238, -0.38847083138358007304, -0.3964051111559218632, -0.40424933471093704718, -0.41200351898670445339, -0.41966764045954657592, -0.42724167671605994823, -0.43472570269465465875, -0.44211966586812145863, -0.44942354462826000772, -0.45663741230964660645, -0.46376118738149285647, -0.4707949592677798667, -0.47773863856196674416, -0.48459224430119612892, -0.49135582837168889636, -0.49802934965189493699, -0.50461280812927267192, -0.51110626341699394448, -0.51750959631015069906, -0.52382288866720938536, -0.53004615613867456236, -0.53617936082021999677, -0.54222250270317717824, -0.54817558178754588472, -0.55403865768592919228, -0.55981157705656303669, -0.56549452792932053402, -0.57108741601215817774, -0.57659024130078040393, -0.58200300378640279497, -0.58732570348214396816, -0.59255836907422165805, -0.59770094374419502348, -0.60275351522775644231, -0.60771602392196655273, -0.61258846980891978884, -0.61737085290595328235, -0.62206323281685904636, -0.62666546318623761458, -0.63117771807165978792, -0.63559985056255718927, -0.63993197985509697734, -0.64417404635342268016, -0.64832605006182852936, -0.65238802665250872348, -0.65635990533500465638, -0.66024178083137297079, -0.66403359352957913586, -0.66773534342877072234, -0.67134703053818467477, -0.67486863414244013804, -0.67830019622629933451, -0.68164175512388880396, -0.68489319162309936218, -0.68805462492398683505, -0.69112599543433772542, -0.6941072856560316362, -0.69699853114125409626, -0.69979977344006472073, -0.70251089334487915039]
+dddX[1]=[0., 0.]
+cp=[4184., 4184.]
+cv=[4184., 4184.]
+lambda=[0.5563939213752746582, 0.55866187815937129457, 0.56090748320067795873, 0.56313073649917455565, 0.56533157845027659505, 0.56751012785959176199, 0.56966626672871534254, 0.57180005305633219148, 0.57391148843134864865, 0.57600057050697883732, 0.57806730239721448861, 0.58011162293142226609, 0.5821336513184121042, 0.58413326834980050517, 0.58611053216647257535, 0.58806544426334517173, 0.58999800750706155039, 0.59190821613644639676, 0.59379601344199095525, 0.59566152139947714517, 0.59750461523710751699, 0.59932536005273928659, 0.60112375042257992774, 0.6028997890729407283, 0.60465347860225360233, 0.60638475418090820312, 0.60809374017281592195, 0.60978030978463604317, 0.61144453267392906426, 0.61308640377506840036, 0.61470591829953880048, 0.61630302629753053179, 0.61787784211254637157, 0.6194302419450222752, 0.6209603542608956861, 0.62246805518524972456, 0.62395339993037601811, 0.62541633775040994525, 0.62685698338853379497, 0.6282752772396763552, 0.62967115557968778017, 0.63104468632704324715, 0.63239586528731095427, 0.6337246885395463325, 0.63503116400077819215, 0.63631522806974460948, 0.63757699623463037764, 0.63881635680509385455, 0.64003342519172878866, 0.64122807866493991558, 0.64240032434463500977, 0.64355027784027230009, 0.64467787955091848673, 0.64578306987363420788, 0.6468659616311746019, 0.64792644852196434879, 0.64896458362832420974, 0.64998036694686545101, 0.65097373887569254247, 0.65194481862374698, 0.65289348139846015151, 0.65381985771565442889, 0.6547238226437813724, 0.65560543578535412923, 0.65646469714037269938, 0.65730160671096860003, 0.65811610010600696263, 0.6589083062447479433, 0.65967810099541634994, 0.66042554396010411111, 0.66115063513716154642, 0.66185337452980141926, 0.66253375814980997038, 0.66319173450644763879, 0.66382735907894685479, 0.66444069147109985352, 0.66503161247020647906, 0.66560018168489054613, 0.66614639911429929242, 0.6666702021045454174, 0.66717171610280989746, 0.66765081871271403369, 0.66810756953486283294, 0.66854202817573826767, 0.66895407542775953136, 0.66934370903833095845, 0.66971105285856835643, 0.67005604489509362764, 0.67037862554027793927, 0.67067885439919205925, 0.67095673147354162325, 0.67121225530837269613, 0.67144542895108039193, 0.67165625080915236644, 0.67184466127751873987, 0.67201071995840466755, 0.67215448645880349066, 0.67227584091381775711, 0.67237484437885375321, 0.67245143645510663255, 0.67250573635101318359]
+pMed=[300000., 300000.]
+TMed=[273.149993896484375, 274.14999391883748103282, 275.14999394119058706565, 276.14999396354363625505, 277.1499939858967991313, 278.14999382198539024103, 279.14999403060301119694, 280.14999386668472425299, 281.14999407530888220208, 282.14999353888998712137, 283.14999374748668969914, 284.14999395609254406736, 285.1499941647210789597, 286.14999437334967069546, 287.14999383688530087966, 288.14999330049369064, 289.14999425413333256074, 290.14999371768715263897, 291.14999318129554239931, 292.14999413491705126944, 293.14999359848906124171, 294.14999455217417789754, 295.14999401570071313472, 296.14999347929091300102, 297.14999443295783976282, 298.149993896484375, 299.14999485021496639092, 300.14999282370115452068, 301.14999377728622675932, 302.1499947309986282562, 303.14999270450300627999, 304.14999365808807851863, 305.1499946117823469649, 306.14999258530491488273, 307.14999353888998712137, 308.14999449256600883018, 309.14999246610676664204, 310.14999341969183888068, 311.14999437334967069546, 312.14999532708026208638, 313.14999330049369064, 314.14999425413333256074, 315.14999520786392395166, 316.14999318129554239931, 317.14999413491705126944, 318.14999508864764266036, 319.14999306209745100205, 320.14999401570071313472, 321.14999496943130452564, 322.14999294289930276136, 323.149993896484375, 324.14999485020075553621, 325.14999580391713607241, 326.14999675763351660862, 327.14999175094993688617, 328.1499927045207982701, 329.14999365808455422666, 330.14999461177166040216, 331.14999556548804093836, 332.14999651920442147457, 333.14999151255722154019, 334.14999246612808292412, 335.14999341969894430804, 336.1499943733425652681, 337.14999532705894580431, 338.14999628077532634052, 339.14999127416450619421, 340.14999222773536757813, 341.14999318130622896206, 342.14999413492057556141, 343.14999508862985067026, 344.14999604234623120647, 345.14999103577179084823, 346.14999198934265223215, 347.14999294291351361608, 348.149993896484375, 349.14999485020075553621, 350.14999580391713607241, 351.14999675763351660862, 352.14999175094993688617, 353.1499927045207982701, 354.14999365808455422666, 355.14999461177166040216, 356.14999556548804093836, 357.14999651920442147457, 358.14999151255722154019, 359.14999246612808292412, 360.14999341969894430804, 361.1499943733425652681, 362.14999532705894580431, 363.14999628077532634052, 364.14999127416450619421, 365.14999222773536757813, 366.14999318130622896206, 367.14999413492057556141, 368.14999508862985067026, 369.14999604234623120647, 370.14999103577179084823, 371.14999198934265223215, 372.14999294291351361608, 373.149993896484375]
+MM=[0.01801526732742786407, 0.01801526732742786407]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Water_Examples_TemperatureDependentDensityTemperatureEnthalpyInversion.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Water_Examples_TemperatureDependentDensityTemperatureEnthalpyInversion.txt
new file mode 100644
index 00000000..8587c9d4
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Water_Examples_TemperatureDependentDensityTemperatureEnthalpyInversion.txt
@@ -0,0 +1,5 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+T=[293.149993896484375, 293.149993896484375]
+time=[0., 1.]
+h=[83680., 83680.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Water_Examples_TemperatureDependentDensityTestImplementation.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Water_Examples_TemperatureDependentDensityTestImplementation.txt
new file mode 100644
index 00000000..438e4f84
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Water_Examples_TemperatureDependentDensityTestImplementation.txt
@@ -0,0 +1,5 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1', 'number of continuous time states': '1', 'linear': ' '}
+volume.medium.T=[293.149993896484375, 293.155883789192102995, 293.16174316432852720027, 293.16763305702943398501, 293.17349243215903698001, 293.17935180620861501666, 293.18524169999636797002, 293.19110107404594600666, 293.19696045028285880107, 293.20285033966865739785, 293.20870971591011766577, 293.21456909215157793369, 293.22042846839303820161, 293.22631836213986389339, 293.23217773402029706631, 293.23803710591892013326, 293.24389648650321760215, 293.24975585833817603998, 293.2556457476966897957, 293.26150512833555694669, 293.26736450017961033154, 293.27322388075481285341, 293.27908325264434097335, 293.28494262447020446416, 293.29080200506359688006, 293.296661376953125, 293.30252075748285278678, 293.30838012056847219355, 293.31423950124371913262, 293.32009888179163681343, 293.32595824485906632617, 293.33181762553431326523, 293.3376464886314352043, 293.34350585177162429318, 293.34936523230135207996, 293.35522461283107986674, 293.36108397586212959141, 293.36691283903201110661, 293.37277221963449846953, 293.37863160009146668017, 293.38449096324984566309, 293.39031982634696760215, 293.39617920682212570682, 293.4020385699623147957, 293.40786743305943673477, 293.41372681355278473347, 293.41958617667478392832, 293.42541503975371597335, 293.43127442028344376013, 293.43710326595464721322, 293.442962646484375, 293.44879150958138325223, 293.4546508899655350433, 293.46047975335358160009, 293.46633909855904676078, 293.47216796183795395336, 293.47802734233118826523, 293.48385620531911399667, 293.4896850685252616131, 293.49554444880021719655, 293.50137327719153290673, 293.50720214014302200667, 293.51306152059993337389, 293.51889038362418204997, 293.52471924657572799333, 293.53054810989101497398, 293.53640745509648013467, 293.54223631844814690339, 293.54806518139963600333, 293.55389404435118194669, 293.55972290748456998699, 293.56555177058157823922, 293.57141111578704339991, 293.57723997888405165213, 293.58306884212663590006, 293.588897705078125, 293.59472656802961409994, 293.6005554309811600433, 293.60638429393264914324, 293.61221312232396485342, 293.61804198527545395336, 293.62387084822694305331, 293.62969971117848899667, 293.63552857412997809661, 293.64132691990351986533, 293.64715574789465790673, 293.65298461084614700667, 293.65881347379769295003, 293.66464233674918204997, 293.67047119970072799333, 293.67626954507409209327, 293.68209837346540780345, 293.68792723641689690339, 293.69372558179026100333, 293.69955444474180694669, 293.70538330769329604664, 293.71121217064478514658, 293.71701048145797585676, 293.7228393444094649567, 293.72863768978288590006, 293.734466552734375]
+time=[0., 1.]
+volume.medium.X[1]=[1., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Water_Examples_WaterProperties_pT.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Water_Examples_WaterProperties_pT.txt
deleted file mode 100644
index 7feb3e4b..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Media_Specialized_Water_Examples_WaterProperties_pT.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-last-generated=2016-09-12
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-p=[500000., 500000.]
-time=[0., 1.]
-X[1]=[1., 1.]
-d=[958.541015625, 958.541015625]
-eta=[0.00028185182600282133, 0.00028185182600282133]
-h=[0., 6323.58998509320281300461, 12647.17997018640562600922, 18970.76995527888357173651, 25294.35994037237469456159, 31617.94874760563106974587, 37941.53991055986989522353, 44265.12871779190754750744, 50588.71988074438559124246, 56912.30633226122881751508, 63235.89749521301564527676, 69559.48475191480247303843, 75883.0798211165820248425, 82206.66707781836157664657, 88530.25743558521207887679, 94853.83998085204802919179, 101177.43976148877118248492, 107501.02230675562168471515, 113824.61266452245763503015, 120148.20463265918078832328, 126471.79499042603129055351, 132795.39477106273989193141, 139118.96950382960494607687, 145442.55986159644089639187, 151766.159642233164049685, 158089.75, 164413.33415563672315329313, 170736.91509053370100446045, 177060.51487117042415775359, 183384.09902680711820721626, 189707.67996170409605838358, 196031.27974234081921167672, 202354.87952297754236496985, 208678.44483297696569934487, 215002.0446135112433694303, 221325.64439414793741889298, 227649.2253290449152700603, 233972.80948468163842335343, 240296.40926531836157664657, 246620.0090459550847299397, 252943.58998085206258110702, 259267.1741364887566305697, 265590.78954212547978386283, 271914.33922702242853119969, 278237.93900765920989215374, 284561.53878829593304544687, 290885.11972319288179278374, 297208.71950382954673841596, 303532.31928446632809937, 309855.90021936327684670687, 316179.5, 322503.06853054685052484274, 328826.66831109375925734639, 335150.26809164060978218913, 341473.83018126955721527338, 347797.42996181646594777703, 354121.02974231838015839458, 360444.6295229101087898016, 366768.19805345695931464434, 373091.79783400386804714799, 379415.35992363281548023224, 385738.95970417972421273589, 392062.55948472657473757863, 398386.15926527342526242137, 404709.75904582027578726411, 411033.35882636718451976776, 417356.88966599613195285201, 423680.48944654304068535566, 430004.0892270898912101984, 436327.68900768161984160542, 442651.28878818353405222297, 448974.88856873044278472662, 455298.45065835939021781087, 461622.05043890624074265361, 467945.61896945314947515726, 474269.21875, 480592.81853054685052484274, 486916.41831109375925734639, 493240.01809164060978218913, 499563.58018126955721527338, 505887.17996181646594777703, 512210.77974231838015839458, 518534.3482729101087898016, 524857.94805371772963553667, 531181.57908359402790665627, 537505.10992400534451007843, 543828.67845440318342298269, 550152.30948465201072394848, 556475.87801534798927605152, 562799.50904559681657701731, 569123.07757673971354961395, 575446.67091558640822768211, 581770.239446803811006248, 588093.80797720164991915226, 594417.43900764430873095989, 600741.00753836985677480698, 607064.63856839516665786505, 613388.16940880636684596539, 619711.80043860827572643757, 626035.36896960216108709574, 632359.]
-u=[0., 6323.58998509320281300461, 12647.17997018640562600922, 18970.76995527888357173651, 25294.35994037237469456159, 31617.94874760563106974587, 37941.53991055986989522353, 44265.12871779190754750744, 50588.71988074438559124246, 56912.30633226122881751508, 63235.89749521301564527676, 69559.48475191480247303843, 75883.0798211165820248425, 82206.66707781836157664657, 88530.25743558521207887679, 94853.83998085204802919179, 101177.43976148877118248492, 107501.02230675562168471515, 113824.61266452245763503015, 120148.20463265918078832328, 126471.79499042603129055351, 132795.39477106273989193141, 139118.96950382960494607687, 145442.55986159644089639187, 151766.159642233164049685, 158089.75, 164413.33415563672315329313, 170736.91509053370100446045, 177060.51487117042415775359, 183384.09902680711820721626, 189707.67996170409605838358, 196031.27974234081921167672, 202354.87952297754236496985, 208678.44483297696569934487, 215002.0446135112433694303, 221325.64439414793741889298, 227649.2253290449152700603, 233972.80948468163842335343, 240296.40926531836157664657, 246620.0090459550847299397, 252943.58998085206258110702, 259267.1741364887566305697, 265590.78954212547978386283, 271914.33922702242853119969, 278237.93900765920989215374, 284561.53878829593304544687, 290885.11972319288179278374, 297208.71950382954673841596, 303532.31928446632809937, 309855.90021936327684670687, 316179.5, 322503.06853054685052484274, 328826.66831109375925734639, 335150.26809164060978218913, 341473.83018126955721527338, 347797.42996181646594777703, 354121.02974231838015839458, 360444.6295229101087898016, 366768.19805345695931464434, 373091.79783400386804714799, 379415.35992363281548023224, 385738.95970417972421273589, 392062.55948472657473757863, 398386.15926527342526242137, 404709.75904582027578726411, 411033.35882636718451976776, 417356.88966599613195285201, 423680.48944654304068535566, 430004.0892270898912101984, 436327.68900768161984160542, 442651.28878818353405222297, 448974.88856873044278472662, 455298.45065835939021781087, 461622.05043890624074265361, 467945.61896945314947515726, 474269.21875, 480592.81853054685052484274, 486916.41831109375925734639, 493240.01809164060978218913, 499563.58018126955721527338, 505887.17996181646594777703, 512210.77974231838015839458, 518534.3482729101087898016, 524857.94805371772963553667, 531181.57908359402790665627, 537505.10992400534451007843, 543828.67845440318342298269, 550152.30948465201072394848, 556475.87801534798927605152, 562799.50904559681657701731, 569123.07757673971354961395, 575446.67091558640822768211, 581770.239446803811006248, 588093.80797720164991915226, 594417.43900764430873095989, 600741.00753836985677480698, 607064.63856839516665786505, 613388.16940880636684596539, 619711.80043860827572643757, 626035.36896960216108709574, 632359.]
-s=[0., 23.08727888043830489551, 46.04881007462768849336, 68.88595733692997669095, 91.60005390413120096582, 114.19241927981528306191, 136.66437067988266562679, 159.01715021415319029074, 181.25204864109508662295, 203.37027714069117223517, 225.37308937953486065453, 247.26164375665675265736, 269.03714571516502473969, 290.70075492713027642822, 312.25356927461950817815, 333.69676458865836821133, 355.03150174735043265173, 376.25875475683869808563, 397.37965411286273820224, 418.39529918500636540557, 439.30666492287480195955, 460.11485124909603428023, 480.82083375989759588265, 501.42555904682478740142, 521.93012571359531648341, 542.33544921875, 562.64247536503989977064, 582.85209017542388210131, 602.96532963815604944102, 622.98304888323298200703, 642.90616525945802095521, 662.73559098431223901571, 682.47218204595321822126, 702.11679557689910780027, 721.67028110605281199241, 741.13355649062407337624, 760.50729655503312187648, 779.79247128956603773986, 798.98981625788621840911, 818.10012491964448599902, 837.12413418917390117713, 856.06275089535563438403, 874.91671166861578967655, 893.68663210639886074205, 912.37341752935583372164, 930.97768325240645026497, 949.50022871140606639528, 967.94177465357915934874, 986.30299816361741704895, 1004.58451628705984148837, 1022.7872314453125, 1040.91163833340328892518, 1058.95840835606304608518, 1076.92827393691322868108, 1094.82186108453015549458, 1112.63987137343315225735, 1130.38280827683433926723, 1148.05152627725806269154, 1165.64639159501416543208, 1183.16813665748736639216, 1200.6172680369390945998, 1217.99460408925165211258, 1235.30052887109309267544, 1252.5357747996818034153, 1269.70083015888667432591, 1286.79630530725557946425, 1303.82258725529914045183, 1320.78048932271303783637, 1337.67039809524476368097, 1354.4930459934334976424, 1371.24867715361779119121, 1387.93814607751028233906, 1404.56159802338856934512, 1421.1198415151545759727, 1437.61338761556930876395, 1454.04248046875, 1470.40797455524284487183, 1486.71011402964245462499, 1502.94950924351110188582, 1519.12643018516723714129, 1535.24155796788272709819, 1551.2954063345769100124, 1567.28834149085332683171, 1583.22085172518768558803, 1599.09330325168684794335, 1614.90621235628759677638, 1630.66013374759018006444, 1646.35533920682337338803, 1661.99231700999871463864, 1677.57155543923931872996, 1693.09342071246715022426, 1708.55818704016724041139, 1723.96652705708220310044, 1739.31883669185867802298, 1754.61548215466928013484, 1769.85670758232163279899, 1785.0431233349979720515, 1800.1748835271323514462, 1815.25253475971703664982, 1830.27659702092410043406, 1845.2471923828125]
-g=[0., -17.33126343972861960196, -69.19896259189322051952, -155.41550398390722875774, -275.79530067415157645883, -430.15477264615248031987, -618.31240587252511886618, -840.08831086215207051282, -1095.30485878049739767448, -1383.78602490029902583046, -1705.35798234251637950365, -2059.84841097380422070273, -2447.08653489670950875734, -2866.90401806348882018938, -3319.13327305590655669221, -3803.60932270634293672629, -4320.16962518795207870426, -4868.65029027286800555885, -5448.89215404346850846196, -6060.73696678485521260882, -6704.02617173530234140344, -7378.60543502163909579394, -8084.31991056527476757765, -8821.0162890339797741035, -9588.54632005947132711299, -10386.7578125, -11215.50373744987155077979, -12074.63578399681500741281, -12964.01161129014690231998, -13883.485157284927481669, -14832.91193988918530521914, -15812.15601369600153702777, -16821.07495307307908660732, -17859.5259665781632065773, -18927.37852016286342404783, -20024.49285186342967790551, -21150.73274727960961172357, -22305.97014674936508527026, -23490.0689322256985178683, -24702.89824391451838891953, -25944.32347200543517828919, -27214.22702273889080970548, -28512.47242773999096243642, -29838.93263694372217287309, -31193.49056132909754524007, -32576.01533990527605055831, -33986.38162632341118296608, -35424.47282965957856504247, -36890.16955896144645521417, -38383.34231554262078134343, -39903.8828125, -41451.66555409961438272148, -43026.58115979362628422678, -44628.50462930263893213123, -46257.32070071525231469423, -47912.9277011622762074694, -49595.20662761892162961885, -51304.04029609967983560637, -53039.32714115350972861052, -54800.94606754302367335185, -56588.78868129283364396542, -58402.75520275480084819719, -60242.73739894855680176988, -62108.62589709991152631119, -64000.3152280956637696363, -65917.69992041983641684055, -67860.6589402101089945063, -69829.12169785614241845906, -71822.97512916295090690255, -73842.10204751108540222049, -75886.42432992474641650915, -77955.82478500781871844083, -80050.19710443673830013722, -82169.46468898077728226781, -84313.52138337244105059654, -86482.2734375, -88675.62710572195646818727, -90893.47300808374711778015, -93135.72520686186908278614, -95402.28417819624883122742, -97693.06757022054807748646, -100007.98382077213318552822, -102346.93137069734802935272, -104709.81646735768299549818, -107096.56879680747806560248, -109507.05673046117590274662, -111941.24650441439007408917, -114399.01444857323076575994, -116880.2824398562079295516, -119384.96454048391024116427, -121912.97481038594560232013, -124464.21203481225529685616, -127038.6128756705584237352, -129636.08407308897585608065, -132256.54750305475317873061, -134899.90941737443790771067, -137566.09950022349948994815, -140255.00790595661965198815, -142966.57293605647282674909, -145700.73175899640773423016, -148457.390625]
-f=[0., -17.33126343972861960196, -69.19896259189322051952, -155.41550398390722875774, -275.79530067415157645883, -430.15477264615248031987, -618.31240587252511886618, -840.08831086215207051282, -1095.30485878049739767448, -1383.78602490029902583046, -1705.35798234251637950365, -2059.84841097380422070273, -2447.08653489670950875734, -2866.90401806348882018938, -3319.13327305590655669221, -3803.60932270634293672629, -4320.16962518795207870426, -4868.65029027286800555885, -5448.89215404346850846196, -6060.73696678485521260882, -6704.02617173530234140344, -7378.60543502163909579394, -8084.31991056527476757765, -8821.0162890339797741035, -9588.54632005947132711299, -10386.7578125, -11215.50373744987155077979, -12074.63578399681500741281, -12964.01161129014690231998, -13883.485157284927481669, -14832.91193988918530521914, -15812.15601369600153702777, -16821.07495307307908660732, -17859.5259665781632065773, -18927.37852016286342404783, -20024.49285186342967790551, -21150.73274727960961172357, -22305.97014674936508527026, -23490.0689322256985178683, -24702.89824391451838891953, -25944.32347200543517828919, -27214.22702273889080970548, -28512.47242773999096243642, -29838.93263694372217287309, -31193.49056132909754524007, -32576.01533990527605055831, -33986.38162632341118296608, -35424.47282965957856504247, -36890.16955896144645521417, -38383.34231554262078134343, -39903.8828125, -41451.66555409961438272148, -43026.58115979362628422678, -44628.50462930263893213123, -46257.32070071525231469423, -47912.9277011622762074694, -49595.20662761892162961885, -51304.04029609967983560637, -53039.32714115350972861052, -54800.94606754302367335185, -56588.78868129283364396542, -58402.75520275480084819719, -60242.73739894855680176988, -62108.62589709991152631119, -64000.3152280956637696363, -65917.69992041983641684055, -67860.6589402101089945063, -69829.12169785614241845906, -71822.97512916295090690255, -73842.10204751108540222049, -75886.42432992474641650915, -77955.82478500781871844083, -80050.19710443673830013722, -82169.46468898077728226781, -84313.52138337244105059654, -86482.2734375, -88675.62710572195646818727, -90893.47300808374711778015, -93135.72520686186908278614, -95402.28417819624883122742, -97693.06757022054807748646, -100007.98382077213318552822, -102346.93137069734802935272, -104709.81646735768299549818, -107096.56879680747806560248, -109507.05673046117590274662, -111941.24650441439007408917, -114399.01444857323076575994, -116880.2824398562079295516, -119384.96454048391024116427, -121912.97481038594560232013, -124464.21203481225529685616, -127038.6128756705584237352, -129636.08407308897585608065, -132256.54750305475317873061, -134899.90941737443790771067, -137566.09950022349948994815, -140255.00790595661965198815, -142966.57293605647282674909, -145700.73175899640773423016, -148457.390625]
-hIse=[0., 6323.58998509320281300461, 12647.17997018640562600922, 18970.76995527888357173651, 25294.35994037237469456159, 31617.94874760563106974587, 37941.53991055986989522353, 44265.12871779190754750744, 50588.71988074438559124246, 56912.30633226122881751508, 63235.89749521301564527676, 69559.48475191480247303843, 75883.0798211165820248425, 82206.66707781836157664657, 88530.25743558521207887679, 94853.83998085204802919179, 101177.43976148877118248492, 107501.02230675562168471515, 113824.61266452245763503015, 120148.20463265918078832328, 126471.79499042603129055351, 132795.39477106273989193141, 139118.96950382960494607687, 145442.55986159644089639187, 151766.159642233164049685, 158089.75, 164413.33415563672315329313, 170736.91509053370100446045, 177060.51487117042415775359, 183384.09902680711820721626, 189707.67996170409605838358, 196031.27974234081921167672, 202354.87952297754236496985, 208678.44483297696569934487, 215002.0446135112433694303, 221325.64439414793741889298, 227649.2253290449152700603, 233972.80948468163842335343, 240296.40926531836157664657, 246620.0090459550847299397, 252943.58998085206258110702, 259267.1741364887566305697, 265590.78954212547978386283, 271914.33922702242853119969, 278237.93900765920989215374, 284561.53878829593304544687, 290885.11972319288179278374, 297208.71950382954673841596, 303532.31928446632809937, 309855.90021936327684670687, 316179.5, 322503.06853054685052484274, 328826.66831109375925734639, 335150.26809164060978218913, 341473.83018126955721527338, 347797.42996181646594777703, 354121.02974231838015839458, 360444.6295229101087898016, 366768.19805345695931464434, 373091.79783400386804714799, 379415.35992363281548023224, 385738.95970417972421273589, 392062.55948472657473757863, 398386.15926527342526242137, 404709.75904582027578726411, 411033.35882636718451976776, 417356.88966599613195285201, 423680.48944654304068535566, 430004.0892270898912101984, 436327.68900768161984160542, 442651.28878818353405222297, 448974.88856873044278472662, 455298.45065835939021781087, 461622.05043890624074265361, 467945.61896945314947515726, 474269.21875, 480592.81853054685052484274, 486916.41831109375925734639, 493240.01809164060978218913, 499563.58018126955721527338, 505887.17996181646594777703, 512210.77974231838015839458, 518534.3482729101087898016, 524857.94805371772963553667, 531181.57908359402790665627, 537505.10992400534451007843, 543828.67845440318342298269, 550152.30948465201072394848, 556475.87801534798927605152, 562799.50904559681657701731, 569123.07757673971354961395, 575446.67091558640822768211, 581770.239446803811006248, 588093.80797720164991915226, 594417.43900764430873095989, 600741.00753836985677480698, 607064.63856839516665786505, 613388.16940880636684596539, 619711.80043860827572643757, 626035.36896960216108709574, 632359.]
-beta=[0., 0.]
-kappa=[0., 0.]
-ddpT=[0., 0.]
-ddTp=[0., 0.]
-dddX[1]=[0., 0.]
-cp=[4215.7265625, 4215.7265625]
-cv=[4215.7265625, 4215.7265625]
-lambda=[0.67798727750778198242, 0.67798727750778198242]
-pMed=[500000., 500000.]
-TMed=[273.149993896484375, 274.64999393001403404924, 276.14999396354369309847, 277.64999399707323846087, 279.14999403060301119694, 280.64999378473021351965, 282.149994097662272452, 283.64999385178265356444, 285.1499941647210789597, 286.64999336006547991929, 288.14999367297650678665, 289.64999398589662860104, 291.14999429883948778297, 292.6499946117823469649, 294.14999380708121634598, 295.64999300245290214662, 297.14999443295783976282, 298.64999362827495588135, 300.14999282364658483857, 301.64999425413333256074, 303.14999344946863857331, 304.6499948800190509246, 306.14999407530888220208, 307.64999327066232126526, 309.14999470119454372252, 310.649993896484375, 312.14999532708026208638, 313.64999228722768975786, 315.14999371767805769196, 316.6499951482557548843, 318.14999210842142929323, 319.64999353887179722733, 321.14999496943130452564, 322.64999192961511198519, 324.14999336006547991929, 325.64999479060679732356, 327.14999175080879467714, 328.64999318125916261124, 330.1499946117823469649, 331.64999604237823405128, 333.14999300245290214662, 334.64999443295783976282, 336.1499958635537268492, 337.64999282364658483857, 339.14999425413333256074, 340.64999568472921964712, 342.14999264484032437394, 343.64999407530888220208, 345.14999550590476928846, 346.6499924660340070659, 348.149993896484375, 349.64999532705894580431, 351.14999675763351660862, 352.64999818820808741293, 354.14999067801903720465, 355.64999210844808885668, 357.14999353886645394596, 358.64999496941527468152, 360.14999639998984548583, 361.64999783056441629014, 363.14999032041174586993, 364.64999175084079752196, 366.14999318126984917399, 367.64999461177166040216, 369.14999604234623120647, 370.64999747292080201078, 372.14998996280451137864, 373.64999139323356303066, 375.14999282366261468269, 376.64999425413867584211, 378.14999568470256008368, 379.64999711527713088799, 381.14998960519722004392, 382.64999103562627169595, 384.14999246605532334797, 385.649993896484375, 387.14999532705894580431, 388.64999675763351660862, 390.14999818820808741293, 391.64999067801903720465, 393.14999210844808885668, 394.64999353886645394596, 396.14999496941527468152, 397.64999639998984548583, 399.14999783056441629014, 400.64999032041174586993, 402.14999175084079752196, 403.64999318126984917399, 405.14999461177166040216, 406.64999604234623120647, 408.14999747292080201078, 409.64998996280451137864, 411.14999139323356303066, 412.64999282366261468269, 414.14999425413867584211, 415.64999568470256008368, 417.14999711527713088799, 418.64998960519722004392, 420.14999103562627169595, 421.64999246605532334797, 423.149993896484375]
-MM=[0.01801526732742786407, 0.01801526732742786407]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Examples_SimpleRoomFourElements.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Examples_SimpleRoomFourElements.txt
deleted file mode 100644
index aba59f53..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Examples_SimpleRoomFourElements.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2017-04-04
-statistics-initialization=
-{
- "linear": "7"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "6",
- "linear": "0, 5, 0, 0"
-}
-thermalZoneFourElements.TAir=[2.951499938964844e+02, 2.941225036621094e+02, 2.895001586914062e+02, 2.904818115234375e+02, 2.933125793457031e+02, 2.906379089355469e+02, 2.918356567382813e+02, 2.932963745117187e+02, 2.910241149902344e+02, 2.92583251953125e+02, 2.958690490722656e+02, 2.925110900878906e+02, 2.935943359375e+02, 2.989253173828125e+02, 2.948279541015625e+02, 2.967113952636719e+02, 2.996177612304688e+02, 2.974717834472656e+02, 3.024110778808594e+02, 3.004395324707031e+02, 3.015155639648438e+02, 3.0376298828125e+02, 3.003684143066406e+02, 2.979274169921875e+02, 3.042062744140625e+02, 3.038013916015625e+02, 3.035104675292969e+02, 3.046660522460937e+02, 3.022451049804687e+02, 3.035399963378906e+02, 3.100688781738281e+02, 3.0362041015625e+02, 3.062351379394531e+02, 3.135020568847656e+02, 3.08224658203125e+02, 3.091820983886719e+02, 3.142312377929687e+02, 3.056537658691406e+02, 3.085746948242187e+02, 3.125273864746094e+02, 3.077545166015625e+02, 3.106182678222656e+02, 3.140743957519531e+02, 3.118535278320313e+02, 3.157748840332031e+02, 3.105911865234375e+02, 3.059767578125e+02, 3.091716064453125e+02, 3.064681762695312e+02, 3.07319970703125e+02, 3.149993896484375e+02, 3.085742614746094e+02, 3.093117431640625e+02, 3.147443359375e+02, 3.081332275390625e+02, 3.076807861328125e+02, 3.145322326660156e+02, 3.089688842773438e+02, 3.110438354492188e+02, 3.158541442871094e+02, 3.105858459472656e+02, 3.151424011230469e+02, 3.076986083984375e+02, 3.0632021484375e+02, 3.107470581054687e+02, 3.045153503417969e+02, 3.056182373046875e+02, 3.104770812988281e+02, 3.055751647949219e+02, 3.069394348144531e+02, 3.08965087890625e+02, 3.060563659667969e+02, 3.053112548828125e+02, 3.092529296875e+02, 3.015037170410156e+02, 3.020732116699219e+02, 3.0833203125e+02, 3.017678833007812e+02, 3.0469306640625e+02, 3.064653625488281e+02, 3.017516479492188e+02, 3.030731872558594e+02, 2.996720947265625e+02, 2.9859912109375e+02, 3.016246826171875e+02, 2.951923522949219e+02, 2.945682861328125e+02, 2.988688659667969e+02, 2.946877319335937e+02, 2.968223999023438e+02, 2.98162841796875e+02, 2.943639465332031e+02, 2.940184936523438e+02, 2.952937316894531e+02, 2.915719055175781e+02, 2.921131896972656e+02, 2.930497009277344e+02, 2.909274597167969e+02, 2.938853210449219e+02, 2.920962280273437e+02, 2.913055725097656e+02]
-time=[0e+00, 3.1536e+07]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Examples_SimpleRoomOneElement.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Examples_SimpleRoomOneElement.txt
deleted file mode 100644
index 6121edcd..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Examples_SimpleRoomOneElement.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2017-04-04
-statistics-initialization=
-{
- "linear": "3"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "3",
- "linear": "0, 0, 2"
-}
-thermalZoneOneElement.TAir=[2.951499938964844e+02, 3.013307922363281e+02, 2.876980773925781e+02, 2.89820654296875e+02, 3.033342834472656e+02, 2.901639709472656e+02, 2.925229309082031e+02, 3.029469360351562e+02, 2.889924438476563e+02, 2.921244262695312e+02, 3.084218139648438e+02, 2.909903137207031e+02, 2.94684130859375e+02, 3.142940246582031e+02, 2.934304809570312e+02, 2.978707275390625e+02, 3.101796203613281e+02, 2.971165649414062e+02, 3.127456665039062e+02, 3.156765869140625e+02, 3.012172241210938e+02, 3.135559631347656e+02, 3.032747314453125e+02, 2.962994445800781e+02, 3.195620300292969e+02, 3.048533325195312e+02, 3.002524475097656e+02, 3.157263977050781e+02, 3.012609069824219e+02, 3.017509887695313e+02, 3.259027709960938e+02, 3.000725280761719e+02, 3.059262145996094e+02, 3.380405029296875e+02, 3.045196472167969e+02, 3.10793701171875e+02, 3.438317626953125e+02, 3.026094360351562e+02, 3.201228149414063e+02, 3.456991821289063e+02, 3.05578369140625e+02, 3.216223510742187e+02, 3.358655212402344e+02, 3.102734191894531e+02, 3.288247985839844e+02, 3.162139282226562e+02, 3.028141479492188e+02, 3.19907080078125e+02, 3.039627258300781e+02, 3.085799194335938e+02, 3.312207641601562e+02, 3.05144775390625e+02, 3.105453308105469e+02, 3.377345581054688e+02, 3.051107788085938e+02, 3.105904846191406e+02, 3.434843200683594e+02, 3.06764794921875e+02, 3.210008911132812e+02, 3.460197631835937e+02, 3.083440856933594e+02, 3.271836364746094e+02, 3.067042541503906e+02, 3.054168640136719e+02, 3.234740234375e+02, 3.012767028808594e+02, 3.045508178710937e+02, 3.2373271484375e+02, 3.015615905761719e+02, 3.064760192871094e+02, 3.216605834960938e+02, 3.037931030273438e+02, 3.032390502929687e+02, 3.2992529296875e+02, 2.990207885742187e+02, 3.009172668457031e+02, 3.349460144042969e+02, 2.989882751464844e+02, 3.116455261230469e+02, 3.303580017089844e+02, 3.006036987304688e+02, 3.114441528320312e+02, 3.004305603027344e+02, 2.968249755859375e+02, 3.120727478027344e+02, 2.924378356933594e+02, 2.938701721191406e+02, 3.116585205078125e+02, 2.931695983886719e+02, 2.969501831054687e+02, 3.093048095703125e+02, 2.916603088378906e+02, 2.933501525878906e+02, 3.033106872558594e+02, 2.889304992675781e+02, 2.914114685058594e+02, 3.004482299804687e+02, 2.896396484375e+02, 2.995425048828125e+02, 2.976939514160156e+02, 2.912432250976562e+02]
-time=[0e+00, 3.1536e+07]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Examples_SimpleRoomThreeElements.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Examples_SimpleRoomThreeElements.txt
deleted file mode 100644
index fb085905..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Examples_SimpleRoomThreeElements.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2017-04-04
-statistics-initialization=
-{
- "linear": "5"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "5",
- "linear": "0, 4, 0"
-}
-thermalZoneThreeElements.TAir=[2.951499938964844e+02, 2.951544250488281e+02, 2.907704528808594e+02, 2.919194213867187e+02, 2.9476689453125e+02, 2.916917114257812e+02, 2.928648559570312e+02, 2.946806091308594e+02, 2.924544372558594e+02, 2.940451232910156e+02, 2.9751025390625e+02, 2.939134216308594e+02, 2.949245178222656e+02, 3.003927978515625e+02, 2.963415466308594e+02, 2.983419799804688e+02, 3.014890502929687e+02, 2.991192993164062e+02, 3.041783935546875e+02, 3.023003173828125e+02, 3.03301513671875e+02, 3.059028869628906e+02, 3.025112426757813e+02, 3.000695922851563e+02, 3.063169982910156e+02, 3.057725524902344e+02, 3.057455444335938e+02, 3.07099951171875e+02, 3.044591918945313e+02, 3.058048400878906e+02, 3.125638732910156e+02, 3.060188293457031e+02, 3.087718139648438e+02, 3.163444030761719e+02, 3.109692810058594e+02, 3.120572204589844e+02, 3.171076782226563e+02, 3.082206909179687e+02, 3.110127258300781e+02, 3.149893615722656e+02, 3.101950073242188e+02, 3.133487548828125e+02, 3.165967163085937e+02, 3.145486877441406e+02, 3.1884912109375e+02, 3.136605834960938e+02, 3.088650634765625e+02, 3.11996435546875e+02, 3.090569641113281e+02, 3.097050903320313e+02, 3.175912475585938e+02, 3.111917785644531e+02, 3.118736694335938e+02, 3.174328735351563e+02, 3.106440246582031e+02, 3.100708312988281e+02, 3.170639465332031e+02, 3.114624938964844e+02, 3.136219787597656e+02, 3.183382202148438e+02, 3.131670532226562e+02, 3.179158203125e+02, 3.103355407714844e+02, 3.086878723144531e+02, 3.132005432128906e+02, 3.067997131347656e+02, 3.079408264160156e+02, 3.128907531738281e+02, 3.078547180175781e+02, 3.091985961914062e+02, 3.113701782226562e+02, 3.082342407226562e+02, 3.075221435546875e+02, 3.114574157714844e+02, 3.033882263183594e+02, 3.039168090820312e+02, 3.103891052246094e+02, 3.036348022460937e+02, 3.068719421386719e+02, 3.085873901367187e+02, 3.037613220214844e+02, 3.052632995605469e+02, 3.01578564453125e+02, 3.004546203613281e+02, 3.035684387207031e+02, 2.9701123046875e+02, 2.960996826171875e+02, 3.004048889160156e+02, 2.961172119140625e+02, 2.983366760253906e+02, 2.999372253417969e+02, 2.959747497558594e+02, 2.957538269042969e+02, 2.968042114257813e+02, 2.929631103515625e+02, 2.935972900390625e+02, 2.945495971679687e+02, 2.922099670410156e+02, 2.953976257324219e+02, 2.937386596679688e+02, 2.927077026367188e+02]
-time=[0e+00, 3.1536e+07]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Examples_SimpleRoomTwoElements.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Examples_SimpleRoomTwoElements.txt
deleted file mode 100644
index eef7c0b4..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Examples_SimpleRoomTwoElements.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2017-04-04
-statistics-initialization=
-{
- "linear": "4"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "4",
- "linear": "0, 3, 0"
-}
-thermalZoneTwoElements.TAir=[2.951499938964844e+02, 2.968498779296875e+02, 2.919258361816406e+02, 2.9368740234375e+02, 2.970977783203125e+02, 2.933699035644531e+02, 2.948290710449219e+02, 2.969214233398437e+02, 2.944566650390625e+02, 2.964074645996094e+02, 3.004102172851562e+02, 2.961041137695312e+02, 2.973407897949219e+02, 3.038273010253906e+02, 2.989609558105469e+02, 3.014578552246094e+02, 3.051410583496094e+02, 3.0238037109375e+02, 3.084574401855469e+02, 3.059322448730469e+02, 3.073948974609375e+02, 3.104071350097656e+02, 3.062684265136719e+02, 3.034018432617187e+02, 3.109905517578125e+02, 3.103269653320312e+02, 3.101835876464844e+02, 3.117067016601562e+02, 3.086557861328125e+02, 3.102513977050781e+02, 3.18499755859375e+02, 3.105156066894531e+02, 3.138981628417969e+02, 3.2306171875e+02, 3.164944946289062e+02, 3.177575073242188e+02, 3.236882934570312e+02, 3.129353698730469e+02, 3.162748901367187e+02, 3.210567687988281e+02, 3.154842834472656e+02, 3.192469848632812e+02, 3.231392395019531e+02, 3.207663024902344e+02, 3.25857080078125e+02, 3.193040466308594e+02, 3.137396728515625e+02, 3.175333984375e+02, 3.14106494140625e+02, 3.149074279785156e+02, 3.244634704589844e+02, 3.166493713378906e+02, 3.173769897460937e+02, 3.240615417480469e+02, 3.159086853027344e+02, 3.152012329101562e+02, 3.235626159667969e+02, 3.16971435546875e+02, 3.194584594726563e+02, 3.249929809570312e+02, 3.189966430664062e+02, 3.247571655273438e+02, 3.153816711425781e+02, 3.134770385742187e+02, 3.189520812988281e+02, 3.112231750488281e+02, 3.127099731445313e+02, 3.186247131347656e+02, 3.125208862304688e+02, 3.142310302734375e+02, 3.167498779296875e+02, 3.130085632324219e+02, 3.121282897949219e+02, 3.167640075683594e+02, 3.070957946777344e+02, 3.0778466796875e+02, 3.155815979003906e+02, 3.074689025878906e+02, 3.114542663574219e+02, 3.133661071777344e+02, 3.077167358398438e+02, 3.094228637695313e+02, 3.050490905761719e+02, 3.037459228515625e+02, 3.074820922851562e+02, 2.995953979492188e+02, 2.98495068359375e+02, 3.037022644042969e+02, 2.985850402832031e+02, 3.013649108886719e+02, 3.031831359863281e+02, 2.984376708984375e+02, 2.982876831054688e+02, 2.993696411132813e+02, 2.948050231933594e+02, 2.957186889648438e+02, 2.967674682617188e+02, 2.940261535644531e+02, 2.979349914550781e+02, 2.95836376953125e+02, 2.947200012207031e+02]
-time=[0e+00, 3.1536e+07]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase1.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase1.txt
deleted file mode 100644
index d27c13b8..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase1.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-last-generated=2016-12-21
-statistics-initialization=
-{
- "linear": "4"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "3",
- "linear": "3, 0"
-}
-mean.y=[0., 302.353485107421875, 297.562957763671875, 299.955718994140625, 305.80694580078125, 301.903076171875, 308.714385986328125, 303.594268798828125, 305.653900146484375, 311.210906982421875, 307.027984619140625, 313.556304931640625, 308.1861572265625, 309.992218017578125, 315.325225830078125, 310.929840087890625, 317.242706298828125, 311.682220458984375, 313.29522705078125, 318.457672119140625, 313.90057373046875, 320.04937744140625, 314.343963623046875, 315.80999755859375, 320.84259033203125, 316.162322998046875, 322.186248779296875, 316.370513916015625, 317.724609375, 322.658355712890625, 317.88433837890625, 323.81317138671875, 317.913421630859375, 319.182342529296875, 324.040802001953125, 319.195404052734375, 325.05181884765625, 319.088134765625, 320.29217529296875, 325.09332275390625, 320.193572998046875, 325.994903564453125, 319.98248291015625, 321.13714599609375, 325.894683837890625, 320.95355224609375, 326.712890625, 320.663421630859375, 321.780487060546875, 326.504791259765625, 321.53216552734375, 327.259552001953125, 321.181854248046875, 322.270294189453125, 326.96929931640625, 321.972686767578125, 327.675750732421875, 321.576568603515625, 322.6431884765625, 327.322967529296875, 322.308074951171875, 327.992645263671875, 321.8770751953125, 322.9271240234375, 327.59222412109375, 322.563446044921875, 328.23388671875, 322.10589599609375, 323.143280029296875, 327.797210693359375, 322.75787353515625, 328.417572021484375, 322.28009033203125, 323.307861328125, 327.95330810546875, 322.9058837890625, 328.55743408203125, 322.412689208984375, 323.43316650390625, 328.0721435546875, 323.018585205078125, 328.66387939453125, 322.513671875, 323.528564453125, 328.16259765625, 323.1043701171875, 328.744964599609375, 322.590545654296875, 323.6011962890625, 328.231475830078125, 323.169708251953125, 328.806671142578125, 322.649078369140625, 323.656494140625, 328.283935546875, 323.219451904296875, 328.853668212890625, 322.69366455078125, 323.6986083984375, 328.3238525390625, 323.257293701171875]
-reference.y[1]=[295.149993896484375, 302.350006103515625, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 317.25, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 311.95001220703125, 328.350006103515625, 323.25]
-time=[0., 5184000.]
-assEqu.threShold=[0.15000000596046447754, 0.15000000596046447754]
-assEqu.satisfied=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-assEqu.diff=[0., 0.00348945148289203644, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.0072946338914334774, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.0261372588574886322, 0.00730660278350114822]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase10.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase10.txt
deleted file mode 100644
index f2428ab6..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase10.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2016-12-21
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "3",
- "linear": "3, 0"
-}
-mean.y=[0., 293.8006591796875, 292.430938720703125, 294.326324462890625, 295.751068115234375, 295.19818115234375, 297.53009033203125, 295.63385009765625, 297.0496826171875, 298.09197998046875, 297.210418701171875, 299.24114990234375, 297.10467529296875, 298.300384521484375, 299.16705322265625, 298.134521484375, 300.0269775390625, 297.7801513671875, 298.874755859375, 299.660797119140625, 298.558929443359375, 300.387847900390625, 298.090362548828125, 299.1385498046875, 299.887542724609375, 298.753814697265625, 300.5535888671875, 298.232818603515625, 299.259674072265625, 299.991668701171875, 298.84332275390625, 300.62969970703125, 298.298248291015625, 299.3153076171875, 300.03948974609375, 298.884429931640625, 300.664642333984375, 298.328277587890625, 299.34088134765625, 300.06146240234375, 298.9033203125, 300.680694580078125, 298.34210205078125, 299.35260009765625, 300.071533203125, 298.9119873046875, 300.688079833984375, 298.348419189453125, 299.358001708984375, 300.076171875, 298.91595458984375, 300.69146728515625, 298.351348876953125, 299.3604736328125, 300.07830810546875, 298.91778564453125, 300.693023681640625, 298.3526611328125, 299.361602783203125, 300.07928466796875, 298.91864013671875, 300.6937255859375, 298.353271484375, 299.36212158203125, 300.0797119140625, 298.91900634765625, 300.694061279296875, 298.35357666015625, 299.36236572265625, 300.079925537109375, 298.919189453125, 300.6942138671875, 298.35369873046875, 299.36248779296875, 300.08001708984375, 298.919281005859375, 300.69427490234375, 298.353759765625, 299.362518310546875, 300.080078125, 298.9193115234375, 300.694305419921875, 298.353790283203125, 299.362548828125, 300.080078125, 298.919342041015625, 300.6943359375, 298.353790283203125, 299.362548828125, 300.080108642578125, 298.919342041015625, 300.6943359375, 298.353790283203125, 299.362548828125, 300.080108642578125, 298.919342041015625, 300.6943359375, 298.353790283203125, 299.362579345703125, 300.080108642578125, 298.919342041015625]
-reference.y[1]=[290.75, 293.850006103515625, 292.649993896484375, 292.649993896484375, 292.649993896484375, 292.649993896484375, 292.649993896484375, 292.649993896484375, 292.649993896484375, 292.649993896484375, 292.649993896484375, 292.649993896484375, 292.649993896484375, 292.649993896484375, 292.649993896484375, 292.649993896484375, 300.04998779296875, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 298.149993896484375, 300.04998779296875, 298.850006103515625]
-time=[0., 5184000.]
-assEqu.threShold=[0.15000000596046447754, 0.15000000596046447754]
-assEqu.satisfied=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-assEqu.diff=[0., 0.04935332387685775757, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.02303342148661613464, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.03010139800608158112, 0.06934741884469985962]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase11.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase11.txt
deleted file mode 100644
index d0020cca..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase11.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-last-generated=2016-12-21
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "3"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "3",
- "number of continuous time states": "4",
- "linear": "0"
-}
-mean.y=[0., 464.111053466796875, -500., -499.999969482421875, 125.41428375244140625, -500., -500., -500., -500., 32.658664703369140625, -500., -500., -500., -500., 28.97924041748046875, -500., -500., -500., -500., 28.8223876953125, -500., -500., -500., -500., 28.8156795501708984375, -500., -500., -500., -500., 28.81539154052734375, -500., -500., -500., -500., 28.815380096435546875, -500., -500., -500., -500., 28.815380096435546875, -500., -500., -500., -500., 28.815380096435546875, -500., -500., -500., -500., 28.815380096435546875, -500., -500., -500., -500., 28.815380096435546875, -500., -500., -500., -500., 28.815380096435546875, -500., -500., -500., -500., 28.815380096435546875, -500., -500., -500., -500., 28.815380096435546875, -500., -500., -500., -500., 28.815380096435546875, -500., -500., -500., -500., 28.815380096435546875, -500., -500., -500., -500., 28.815380096435546875, -500., -500., -500., -500., 28.815380096435546875, -500., -500., -500., -500., 28.815380096435546875, -500., -500., -500., -500., 28.815380096435546875, -500.]
-reference.y[2]=[0., 464., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., 28., -500.]
-time=[0., 5184000.]
-assEqu.threShold=[1.5, 1.5]
-assEqu.satisfied=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-assEqu.diff=[0., 0.11104698479175567627, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.00000000000699174052, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.81537938117980957031, 0.00000000003581135388]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase12.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase12.txt
deleted file mode 100644
index 0373e088..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase12.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2016-12-21
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "5",
- "linear": "0, 2, 0"
-}
-mean.y=[0., 298.6617431640625, 295.697296142578125, 299.543212890625, 300.205352783203125, 299.4207763671875, 302.67578125, 298.95172119140625, 302.434051513671875, 302.952728271484375, 301.682220458984375, 304.8345947265625, 300.703887939453125, 303.9906005859375, 304.43206787109375, 302.899871826171875, 305.99700927734375, 301.6473388671875, 304.8287353515625, 305.228607177734375, 303.5555419921875, 306.6229248046875, 302.15533447265625, 305.280029296875, 305.657501220703125, 303.9085693359375, 306.959930419921875, 302.428863525390625, 305.52301025390625, 305.888458251953125, 304.098663330078125, 307.141387939453125, 302.576141357421875, 305.65386962890625, 306.012786865234375, 304.201019287109375, 307.239105224609375, 302.65545654296875, 305.72430419921875, 306.079742431640625, 304.256134033203125, 307.291717529296875, 302.698150634765625, 305.762237548828125, 306.115814208984375, 304.28582763671875, 307.320037841796875, 302.721160888671875, 305.782684326171875, 306.135223388671875, 304.301788330078125, 307.335296630859375, 302.7335205078125, 305.793670654296875, 306.145660400390625, 304.310394287109375, 307.343505859375, 302.740203857421875, 305.799591064453125, 306.15130615234375, 304.315032958984375, 307.347930908203125, 302.743804931640625, 305.80279541015625, 306.154327392578125, 304.317535400390625, 307.350311279296875, 302.7457275390625, 305.80450439453125, 306.15594482421875, 304.318878173828125, 307.351593017578125, 302.74676513671875, 305.805419921875, 306.156829833984375, 304.319580078125, 307.352294921875, 302.747314453125, 305.805908203125, 306.157318115234375, 304.319976806640625, 307.3526611328125, 302.74761962890625, 305.806182861328125, 306.157562255859375, 304.3201904296875, 307.352874755859375, 302.747802734375, 305.80633544921875, 306.15771484375, 304.3203125, 307.35296630859375, 302.74786376953125, 305.806396484375, 306.15777587890625, 304.32037353515625, 307.35302734375, 302.7479248046875, 305.80645751953125, 306.157806396484375, 304.320404052734375]
-reference.y[1]=[294.649993896484375, 298.649993896484375, 296.75, 296.75, 296.75, 296.75, 296.75, 296.75, 296.75, 296.75, 296.75, 296.75, 296.75, 296.75, 296.75, 296.75, 306.04998779296875, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 302.95001220703125, 306.149993896484375, 304.350006103515625]
-time=[0., 5184000.]
-assEqu.threShold=[0.15000000596046447754, 0.15000000596046447754]
-assEqu.satisfied=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-assEqu.diff=[0., 0.01175128016620874405, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.05299238860607147217, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.00781595800071954727, 0.02960255928337574005]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase2.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase2.txt
deleted file mode 100644
index 9c51a6f9..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase2.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-last-generated=2016-12-21
-statistics-initialization=
-{
- "linear": "4"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "3",
- "linear": "3, 0"
-}
-mean.y=[0., 297.28466796875, 297.571868896484375, 299.96630859375, 300.7581787109375, 301.928436279296875, 303.67413330078125, 303.630523681640625, 305.690338134765625, 306.1866455078125, 307.07659912109375, 308.537994384765625, 308.243255615234375, 310.048370361328125, 310.31964111328125, 310.996185302734375, 312.24114990234375, 311.75518798828125, 313.366363525390625, 313.466339111328125, 313.980377197265625, 315.060577392578125, 314.42901611328125, 315.892547607421875, 315.862060546875, 316.252410888671875, 317.207122802734375, 316.464752197265625, 317.81585693359375, 317.686065673828125, 317.98223876953125, 318.8414306640625, 318.014678955078125, 319.28021240234375, 319.074798583984375, 319.29925537109375, 320.085723876953125, 319.1947021484375, 320.39508056640625, 320.132110595703125, 320.30194091796875, 321.0330810546875, 320.0931396484375, 321.243896484375, 320.937103271484375, 321.06536865234375, 321.75433349609375, 320.77716064453125, 321.89013671875, 321.54998779296875, 321.6466064453125, 322.303466796875, 321.297943115234375, 322.382171630859375, 322.0166015625, 322.089141845703125, 322.7215576171875, 321.6944580078125, 322.75677490234375, 322.371856689453125, 322.426055908203125, 323.039886474609375, 321.996337890625, 323.0419921875, 322.642333984375, 322.682586669921875, 323.2822265625, 322.226165771484375, 323.259124755859375, 322.8482666015625, 322.87786865234375, 323.46673583984375, 322.401153564453125, 323.424468994140625, 323.00506591796875, 323.026580810546875, 323.60723876953125, 322.534393310546875, 323.550323486328125, 323.124420166015625, 323.1397705078125, 323.714202880859375, 322.63580322265625, 323.646148681640625, 323.21533203125, 323.2259521484375, 323.795623779296875, 322.713043212890625, 323.7191162109375, 323.284515380859375, 323.291595458984375, 323.85760498046875, 322.7718505859375, 323.774658203125, 323.337188720703125, 323.341552734375, 323.904815673828125, 322.81658935546875, 323.81695556640625, 323.3773193359375, 323.37957763671875]
-reference.y[1]=[295.149993896484375, 297.25, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 297.649993896484375, 312.25, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 312.04998779296875, 323.350006103515625, 323.350006103515625]
-time=[0., 5184000.]
-assEqu.threShold=[0.15000000596046447754, 0.15000000596046447754]
-assEqu.satisfied=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-assEqu.diff=[0., 0.03467077016830444336, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.00884555000811815262, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.02730510011315345764, 0.02958946116268634796]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase3.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase3.txt
deleted file mode 100644
index 64e09579..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase3.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-last-generated=2016-12-21
-statistics-initialization=
-{
- "linear": "4"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "3",
- "linear": "3, 0"
-}
-mean.y=[0., 306.3118896484375, 299.579315185546875, 303.996551513671875, 312.10894775390625, 306.750885009765625, 316.63934326171875, 308.84466552734375, 312.244842529296875, 319.50897216796875, 313.389862060546875, 322.549560546875, 314.1470947265625, 316.9652099609375, 323.743896484375, 317.189239501953125, 325.931884765625, 317.18157958984375, 319.666595458984375, 326.16748046875, 319.36358642578125, 327.8675537109375, 318.91815185546875, 321.212554931640625, 327.554443359375, 320.60791015625, 328.97528076171875, 319.911956787109375, 322.0972900390625, 328.348175048828125, 321.32000732421875, 329.609222412109375, 320.480712890625, 322.603607177734375, 328.80242919921875, 321.7275390625, 329.972015380859375, 320.80621337890625, 322.89337158203125, 329.0623779296875, 321.960784912109375, 330.179656982421875, 320.992462158203125, 323.0592041015625, 329.211151123046875, 322.09423828125, 330.2984619140625, 321.09906005859375, 323.154083251953125, 329.296295166015625, 322.170623779296875, 330.366455078125, 321.160064697265625, 323.208404541015625, 329.34503173828125, 322.214324951171875, 330.405364990234375, 321.194976806640625, 323.239471435546875, 329.372894287109375, 322.239349365234375, 330.427642822265625, 321.2149658203125, 323.25726318359375, 329.38885498046875, 322.253662109375, 330.440399169921875, 321.226409912109375, 323.2674560546875, 329.397979736328125, 322.261871337890625, 330.44769287109375, 321.232940673828125, 323.27325439453125, 329.403228759765625, 322.26654052734375, 330.451873779296875, 321.2366943359375, 323.276611328125, 329.406219482421875, 322.26922607421875, 330.454254150390625, 321.23883056640625, 323.27850341796875, 329.407928466796875, 322.270782470703125, 330.45562744140625, 321.24005126953125, 323.27960205078125, 329.408905029296875, 322.271636962890625, 330.456390380859375, 321.240753173828125, 323.28021240234375, 329.409454345703125, 322.27215576171875, 330.45684814453125, 321.24114990234375, 323.28057861328125, 329.4097900390625, 322.272430419921875]
-reference.y[1]=[295.149993896484375, 306.350006103515625, 299.75, 299.75, 299.75, 299.75, 299.75, 299.75, 299.75, 299.75, 299.75, 299.75, 299.75, 299.75, 299.75, 299.75, 325.95001220703125, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 317.850006103515625, 329.45001220703125, 322.25]
-time=[0., 5184000.]
-assEqu.threShold=[0.15000000596046447754, 0.15000000596046447754]
-assEqu.satisfied=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-assEqu.diff=[0., 0.03811715170741081238, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.01810875721275806427, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.04022079333662986755, 0.02244150079786777496]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase4.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase4.txt
deleted file mode 100644
index 5cd0e818..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase4.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-last-generated=2016-12-21
-statistics-initialization=
-{
- "linear": "4"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "3",
- "linear": "3, 0"
-}
-mean.y=[0., 301.245391845703125, 299.600494384765625, 304.02947998046875, 307.070159912109375, 306.806304931640625, 311.622161865234375, 308.91009521484375, 312.31719970703125, 314.505523681640625, 313.477020263671875, 317.560638427734375, 314.23785400390625, 317.06011962890625, 318.76068115234375, 317.2945556640625, 320.959136962890625, 317.286834716796875, 319.7744140625, 321.195831298828125, 319.479248046875, 322.904022216796875, 319.031707763671875, 321.3277587890625, 322.58941650390625, 320.72955322265625, 324.017059326171875, 320.0302734375, 322.216705322265625, 323.386962890625, 321.445068359375, 324.654022216796875, 320.60174560546875, 322.7254638671875, 323.8433837890625, 321.854522705078125, 325.0185546875, 320.92877197265625, 323.0166015625, 324.104583740234375, 322.0888671875, 325.2271728515625, 321.115936279296875, 323.183197021484375, 324.254058837890625, 322.22296142578125, 325.3465576171875, 321.223052978515625, 323.278564453125, 324.339599609375, 322.299713134765625, 325.414886474609375, 321.284332275390625, 323.3331298828125, 324.3885498046875, 322.343658447265625, 325.4539794921875, 321.319427490234375, 323.364349365234375, 324.41656494140625, 322.3687744140625, 325.476348876953125, 321.339508056640625, 323.382232666015625, 324.4326171875, 322.3831787109375, 325.489166259765625, 321.350982666015625, 323.3924560546875, 324.4417724609375, 322.391387939453125, 325.496490478515625, 321.357574462890625, 323.3983154296875, 324.447021484375, 322.3961181640625, 325.500701904296875, 321.361328125, 323.40167236328125, 324.450042724609375, 322.3988037109375, 325.503082275390625, 321.36346435546875, 323.403564453125, 324.451751708984375, 322.400360107421875, 325.50445556640625, 321.364715576171875, 323.4046630859375, 324.452728271484375, 322.401214599609375, 325.5052490234375, 321.36541748046875, 323.405303955078125, 324.45330810546875, 322.4017333984375, 325.505706787109375, 321.365814208984375, 323.405670166015625, 324.45361328125, 322.40203857421875]
-reference.y[1]=[295.149993896484375, 301.25, 299.75, 299.75, 299.75, 299.75, 299.75, 299.75, 299.75, 299.75, 299.75, 299.75, 299.75, 299.75, 299.75, 299.75, 320.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 317.95001220703125, 324.45001220703125, 322.350006103515625]
-time=[0., 5184000.]
-assEqu.threShold=[0.15000000596046447754, 0.15000000596046447754]
-assEqu.satisfied=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-assEqu.diff=[0., 0.00462318304926156998, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.00912328623235225677, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.00362766953185200691, 0.05202377960085868835]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase5.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase5.txt
deleted file mode 100644
index f0b00671..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase5.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2016-12-21
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "3",
- "linear": "3, 0"
-}
-mean.y=[0., 298.326416015625, 297.05145263671875, 299.247711181640625, 300.984222412109375, 300.769287109375, 303.5570068359375, 302.0078125, 303.9300537109375, 305.4248046875, 304.980560302734375, 307.535736083984375, 305.781097412109375, 307.494964599609375, 308.805633544921875, 308.18682861328125, 310.56494140625, 308.653900146484375, 310.209136962890625, 311.379669189453125, 310.627960205078125, 312.87127685546875, 310.841156005859375, 312.275604248046875, 313.33941650390625, 312.48651123046875, 314.627197265625, 312.50640869140625, 313.848907470703125, 314.83148193359375, 313.901519775390625, 315.964080810546875, 313.774261474609375, 315.0467529296875, 315.96746826171875, 314.978851318359375, 316.98193359375, 314.739532470703125, 315.958740234375, 316.832366943359375, 315.799102783203125, 317.756866455078125, 315.474456787109375, 316.653076171875, 317.4908447265625, 316.423583984375, 318.34686279296875, 316.03399658203125, 317.181732177734375, 317.992218017578125, 316.8990478515625, 318.79608154296875, 316.46002197265625, 317.584197998046875, 318.3739013671875, 317.26104736328125, 319.138092041015625, 316.78436279296875, 317.890625, 318.664520263671875, 317.536651611328125, 319.398468017578125, 317.03131103515625, 318.123931884765625, 318.885772705078125, 317.7464599609375, 319.596710205078125, 317.219329833984375, 318.30157470703125, 319.054229736328125, 317.906219482421875, 319.747650146484375, 317.362457275390625, 318.436798095703125, 319.1824951171875, 318.027862548828125, 319.862579345703125, 317.471435546875, 318.539764404296875, 319.280120849609375, 318.1204833984375, 319.950042724609375, 317.554412841796875, 318.6181640625, 319.3544921875, 318.19097900390625, 320.01666259765625, 317.617584228515625, 318.6778564453125, 319.41107177734375, 318.244659423828125, 320.0673828125, 317.665679931640625, 318.723297119140625, 319.45416259765625, 318.2855224609375, 320.105987548828125, 317.702301025390625, 318.757904052734375, 319.48699951171875, 318.316650390625]
-reference.y[1]=[295.149993896484375, 298.350006103515625, 297.25, 297.25, 297.25, 297.25, 297.25, 297.25, 297.25, 297.25, 297.25, 297.25, 297.25, 297.25, 297.25, 297.25, 310.54998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 309.04998779296875, 319.45001220703125, 318.350006103515625]
-time=[0., 5184000.]
-assEqu.threShold=[0.15000000596046447754, 0.15000000596046447754]
-assEqu.satisfied=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-assEqu.diff=[0., 0.02359818480908870697, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.01495191361755132675, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.03698739036917686462, 0.03335922583937644958]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase6.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase6.txt
deleted file mode 100644
index f689c95a..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase6.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-last-generated=2016-12-21
-statistics-initialization=
-{
- "linear": "3"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "3",
- "linear": "0, 2"
-}
-mean.y=[0., -351.01678466796875, 430.513458251953125, 869.35992431640625, -155.304534912109375, 801.3204345703125, 75.51751708984375, 669.43310546875, 997.90185546875, -83.22072601318359375, 841.74420166015625, 97.2692413330078125, 681.6312255859375, 1004.465576171875, -79.53985595703125, 843.80841064453125, 98.37996673583984375, 682.254150390625, 1004.80072021484375, -79.351898193359375, 843.913818359375, 98.43668365478515625, 682.28594970703125, 1004.81781005859375, -79.3423004150390625, 843.919189453125, 98.43958282470703125, 682.28753662109375, 1004.8187255859375, -79.34180450439453125, 843.91949462890625, 98.439727783203125, 682.28765869140625, 1004.81878662109375, -79.3417816162109375, 843.91949462890625, 98.43973541259765625, 682.28765869140625, 1004.81878662109375, -79.3417816162109375, 843.91949462890625, 98.43973541259765625, 682.28765869140625, 1004.81878662109375, -79.3417816162109375, 843.91949462890625, 98.43973541259765625, 682.28765869140625, 1004.81878662109375, -79.3417816162109375, 843.91949462890625, 98.43973541259765625, 682.28765869140625, 1004.81878662109375, -79.3417816162109375, 843.91949462890625, 98.43973541259765625, 682.28765869140625, 1004.81878662109375, -79.3417816162109375, 843.91949462890625, 98.43973541259765625, 682.28765869140625, 1004.81878662109375, -79.3417816162109375, 843.91949462890625, 98.43973541259765625, 682.28765869140625, 1004.81878662109375, -79.3417816162109375, 843.91949462890625, 98.43973541259765625, 682.28765869140625, 1004.81878662109375, -79.3417816162109375, 843.91949462890625, 98.43973541259765625, 682.28765869140625, 1004.81878662109375, -79.3417816162109375, 843.91949462890625, 98.43973541259765625, 682.28765869140625, 1004.81878662109375, -79.3417816162109375, 843.91949462890625, 98.43973541259765625, 682.28765869140625, 1004.81878662109375, -79.3417816162109375, 843.91949462890625, 98.43973541259765625, 682.28765869140625, 1004.81878662109375, -79.3417816162109375, 843.91949462890625, 98.43973541259765625, 682.28765869140625, 1004.81878662109375, -79.3417816162109375, 843.91949462890625]
-reference.y[1]=[0., -351., 511., 511., 511., 511., 511., 511., 511., 511., 511., 511., 511., 511., 511., 511., 99., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., 808., -78., 843.]
-time=[0., 5184000.]
-assEqu.threShold=[1.5, 1.5]
-assEqu.satisfied=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-assEqu.diff=[0., 0.01678791642189025879, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.62003225088119506836, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1.34178149700164794922, 0.91949540376663208008]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase7.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase7.txt
deleted file mode 100644
index 160e5c1f..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase7.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-last-generated=2016-12-21
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "4"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "3",
- "number of continuous time states": "4",
- "linear": "0"
-}
-mean.y=[0., 374.4501953125, -428.96710205078125, -499.727142333984375, 79.4514923095703125, -500., -194.7335968017578125, -500., -499.998016357421875, -150.7207183837890625, -500., -302.871856689453125, -500., -499.999053955078125, -195.7863311767578125, -500., -324.044189453125, -500., -499.99920654296875, -204.6096954345703125, -500., -328.18951416015625, -500., -499.999237060546875, -206.33721923828125, -500., -329.001129150390625, -500., -499.999237060546875, -206.6754608154296875, -500., -329.1600341796875, -500., -499.999237060546875, -206.7416839599609375, -500., -329.191131591796875, -500., -499.999237060546875, -206.754638671875, -500., -329.197235107421875, -500., -499.999237060546875, -206.7571868896484375, -500., -329.19842529296875, -500., -499.999237060546875, -206.7576751708984375, -500., -329.19866943359375, -500., -499.999237060546875, -206.757781982421875, -500., -329.198699951171875, -500., -499.999237060546875, -206.7577972412109375, -500., -329.198699951171875, -500., -499.999237060546875, -206.7577972412109375, -500., -329.198699951171875, -500., -499.999237060546875, -206.7577972412109375, -500., -329.198699951171875, -500., -499.999237060546875, -206.7577972412109375, -500., -329.198699951171875, -500., -499.999237060546875, -206.7577972412109375, -500., -329.198699951171875, -500., -499.999237060546875, -206.7577972412109375, -500., -329.198699951171875, -500., -499.999237060546875, -206.7577972412109375, -500., -329.198699951171875, -500., -499.999237060546875, -206.7577972412109375, -500., -329.198699951171875, -500., -499.999237060546875, -206.7577972412109375, -500.]
-reference.y[1]=[0., 374., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -324., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -500., -207., -500.]
-time=[0., 5184000.]
-assEqu.threShold=[1.5, 1.5]
-assEqu.satisfied=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-assEqu.diff=[0., 0.45020744204521179199, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.04418980330228805542, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.24220010638236999512, 0.0000000000231921149]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase8.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase8.txt
deleted file mode 100644
index 26c63448..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase8.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2016-12-21
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "3",
- "linear": "3, 0"
-}
-mean.y=[0., 299.432647705078125, 298.2886962890625, 301.82379150390625, 303.610198974609375, 303.74859619140625, 306.952545166015625, 304.989501953125, 307.75299072265625, 308.9005126953125, 308.468963623046875, 311.130218505859375, 308.71710205078125, 311.05206298828125, 311.844146728515625, 311.095489501953125, 313.45477294921875, 310.791229248046875, 312.887725830078125, 313.4820556640625, 312.55694580078125, 314.74822998046875, 311.945343017578125, 313.90911865234375, 314.3934326171875, 313.3701171875, 315.467926025390625, 312.587493896484375, 314.47747802734375, 314.900543212890625, 313.822601318359375, 315.868377685546875, 312.94482421875, 314.793701171875, 315.182708740234375, 314.074371337890625, 316.0911865234375, 313.14361572265625, 314.96966552734375, 315.3397216796875, 314.214447021484375, 316.215179443359375, 313.2542724609375, 315.06756591796875, 315.427093505859375, 314.29241943359375, 316.2841796875, 313.315826416015625, 315.122039794921875, 315.475677490234375, 314.335784912109375, 316.32257080078125, 313.350067138671875, 315.152374267578125, 315.50274658203125, 314.35992431640625, 316.343902587890625, 313.369110107421875, 315.169219970703125, 315.517791748046875, 314.37335205078125, 316.355804443359375, 313.379730224609375, 315.178619384765625, 315.526153564453125, 314.38079833984375, 316.3624267578125, 313.3856201171875, 315.183837890625, 315.53082275390625, 314.384979248046875, 316.3660888671875, 313.388916015625, 315.186737060546875, 315.533416748046875, 314.38726806640625, 316.368133544921875, 313.3907470703125, 315.1883544921875, 315.53485107421875, 314.388580322265625, 316.369293212890625, 313.391754150390625, 315.18927001953125, 315.535675048828125, 314.3892822265625, 316.369903564453125, 313.392333984375, 315.18975830078125, 315.536102294921875, 314.389678955078125, 316.370269775390625, 313.39263916015625, 315.190032958984375, 315.536346435546875, 314.389892578125, 316.370452880859375, 313.392822265625, 315.190185546875, 315.5364990234375, 314.3900146484375]
-reference.y[1]=[295.149993896484375, 299.45001220703125, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 313.45001220703125, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 315.54998779296875, 314.350006103515625]
-time=[0., 5184000.]
-assEqu.threShold=[0.15000000596046447754, 0.15000000596046447754]
-assEqu.satisfied=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-assEqu.diff=[0., 0.01736281253397464752, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.00478105992078781128, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.01350658386945724487, 0.04002973437309265137]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase9.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase9.txt
deleted file mode 100644
index 383adf09..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase9.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2016-12-21
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "3",
- "linear": "3, 0"
-}
-mean.y=[0., 299.447662353515625, 298.277435302734375, 301.83880615234375, 303.620269775390625, 303.761444091796875, 306.97760009765625, 304.987274169921875, 307.7760009765625, 308.917694091796875, 308.488189697265625, 311.160919189453125, 308.71990966796875, 311.079498291015625, 311.865325927734375, 311.11822509765625, 313.488616943359375, 310.79681396484375, 312.91766357421875, 313.50543212890625, 312.5816650390625, 314.783782958984375, 311.952484130859375, 313.9404296875, 314.41802978515625, 313.39593505859375, 315.50445556640625, 312.59552001953125, 314.509552001953125, 314.92584228515625, 313.849029541015625, 315.90545654296875, 312.95330810546875, 314.826202392578125, 315.2083740234375, 314.10113525390625, 316.128570556640625, 313.15240478515625, 315.002410888671875, 315.3656005859375, 314.241424560546875, 316.252716064453125, 313.263153076171875, 315.100433349609375, 315.45306396484375, 314.319488525390625, 316.321807861328125, 313.324798583984375, 315.154998779296875, 315.501739501953125, 314.3629150390625, 316.360260009765625, 313.359100341796875, 315.18536376953125, 315.528839111328125, 314.3870849609375, 316.381622314453125, 313.378173828125, 315.202239990234375, 315.543914794921875, 314.4005126953125, 316.393524169921875, 313.3887939453125, 315.211639404296875, 315.552276611328125, 314.407989501953125, 316.400146484375, 313.39471435546875, 315.21685791015625, 315.55694580078125, 314.41217041015625, 316.403839111328125, 313.39801025390625, 315.21978759765625, 315.559539794921875, 314.41448974609375, 316.4058837890625, 313.39984130859375, 315.221405029296875, 315.561004638671875, 314.415771484375, 316.40704345703125, 313.400848388671875, 315.2222900390625, 315.561798095703125, 314.41650390625, 316.40765380859375, 313.40142822265625, 315.222808837890625, 315.562255859375, 314.416900634765625, 316.40802001953125, 313.4017333984375, 315.22308349609375, 315.5625, 314.4171142578125, 316.408203125, 313.40191650390625, 315.223236083984375, 315.5626220703125, 314.417236328125]
-reference.y[1]=[295.149993896484375, 299.45001220703125, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 298.649993896484375, 313.45001220703125, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 311.54998779296875, 315.45001220703125, 314.350006103515625]
-time=[0., 5184000.]
-assEqu.threShold=[0.15000000596046447754, 0.15000000596046447754]
-assEqu.satisfied=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-assEqu.diff=[0., 0.00234048254787921906, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.03860399127006530762, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.11263459175825119019, 0.06723441183567047119]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Diagnostics_Validation_CheckEquality.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Diagnostics_Validation_CheckEquality.txt
new file mode 100644
index 00000000..ae158cc1
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Diagnostics_Validation_CheckEquality.txt
@@ -0,0 +1,11 @@
+last-generated=2017-01-17
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+cheEqu.y=[0., 0., 0., 0., 0., 0., 0.01104373694559374411, 0.0127733787011933813, 0.01445261045921721055, 0.01607480401772392459, 0.01763355709137417321, 0.01912271985082596854, 0.02053641378263513367, 0.02186906026323552285, 0.02311539642747610299, 0.02427050963491141425, 0.02532983793317805307, 0.0262892002460168861, 0.02714481146578802406, 0.02789329381176764225, 0.02853169460781626587, 0.02905749559581655497, 0.02946861837405703732, 0.02976344142937991169, 0.02994080266110920804, 0.02999999932944774628, 0.02994080247981070753, 0.02976344177369711838, 0.02946861837405703732, 0.02905749489526946588, 0.02853169546569218201, 0.02789329381176764225, 0.02714481146578802406, 0.02628920158737840795, 0.0253298379331780496, 0.02427050963491141772, 0.02311539820531925693, 0.02186906026323552285, 0.02053641275720830342, 0.01912271767631757921, 0.01763355822441553186, 0.01607480401772392806, 0.01445260799145317056, 0.01277337996843994766, 0.0110437362922670302, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., -0.01104373629226079907, -0.0127733799684218146, -0.01445261291198008877, -0.01607480874624990508, -0.01763355366742445224, -0.01912271767634870015, -0.02053641275721812195, -0.02186906026322641555, -0.02311539820529383976, -0.02427051291958823298, -0.02532983490058436649, -0.02628919887745670425, -0.02714481146579669421, -0.02789329381177006392, -0.02853169546568203388, -0.02905749627719993178, -0.02946861728955231519, -0.02976344105984997379, -0.02994080247981256021, -0.02999999932944774628, -0.02994080247981256021, -0.02976344105984997379, -0.02946861728955231519, -0.02905749627719993178, -0.02853169546568203388, -0.02789329381177006392, -0.02714481146579669421, -0.02628919887745670425, -0.02532983490058436649, -0.02427051291958823298, -0.02311539820529383976, -0.02186906026322641555, -0.02053641275721812195, -0.01912271767634870015, -0.01763355366742445224, -0.01607480874624990508, -0.01445261291198008877, -0.0127733799684218146, -0.01104373629226079907, 0., 0., 0., 0., 0., 0.]
+time=[0., 1.]
+cheEqu.u2=[0.10000000149011611938, 0.10188371692330655538, 0.1037599966765300058, 0.10562144232275652578, 0.10746070013845351876, 0.10927051292387138237, 0.11104373657306283729, 0.11277338112263138314, 0.11445260822404386414, 0.11607479991991125068, 0.11763355858149028565, 0.11912272134094097076, 0.12053641713539389735, 0.12186905802807022903, 0.12311539791759222584, 0.12427050553710873582, 0.1253298375606590187, 0.12628920359877982005, 0.12714481295587748422, 0.12789329902716739529, 0.12853169423528446047, 0.12905749708590824598, 0.12946861986416982604, 0.12976343919422128614, 0.12994080787648065733, 0.12999999523162841797, 0.12994080769516383467, 0.1297634395385229289, 0.12946861986416982604, 0.12905749638535449209, 0.12853169509319645192, 0.12789329902716739529, 0.12714481295587748422, 0.12628920494009082676, 0.1253298375606590187, 0.12427050553710873582, 0.12311539969542205364, 0.12186905802807022903, 0.12053641610996512767, 0.11912271916642037939, 0.11763355971452055249, 0.11607479991991126456, 0.11445260575628510291, 0.11277338238986198138, 0.11104373591974243951, 0.10927051091631491408, 0.10746070149647526937, 0.10562144197777058319, 0.10375999458508873563, 0.10188371867461035181, 0.10000000149011611938, 0.0981162843056486017, 0.09624000282328275258, 0.09437855549065406191, 0.09253930692849650363, 0.09072949206384101073, 0.08895626706049603039, 0.08722662059036173643, 0.08554738485283795713, 0.08392519088126991489, 0.08236644782269166021, 0.08087728381378074538, 0.07946358687025728562, 0.07813093750160828022, 0.07688460328483559536, 0.07572948670790494163, 0.0746701684520792025, 0.07371080074999872278, 0.0728551900243194217, 0.07210670395306241487, 0.07146830043650974351, 0.07094250521291618761, 0.07053138420051051349, 0.07023655670497584713, 0.07005919528503103122, 0.07000000029802322388, 0.07005919528503103122, 0.07023655670497584713, 0.07053138420051051349, 0.07094250521291618761, 0.07146830043650974351, 0.07210670395306241487, 0.0728551900243194217, 0.07371080074999872278, 0.0746701684520792025, 0.07572948670790494163, 0.07688460328483559536, 0.07813093750160828022, 0.07946358687025728562, 0.08087728381378074538, 0.08236644782269166021, 0.08392519088126991489, 0.08554738485283795713, 0.08722662059036173643, 0.08895626706049603039, 0.09072949206384101073, 0.09253930692849650363, 0.09437855549065406191, 0.09624000282328275258, 0.0981162843056486017, 0.10000000149011611938]
+cheEqu.u1=[0.10000000149011611938, 0.10000000149011611938]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_Average.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_Average.txt
deleted file mode 100644
index e894455c..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_Average.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-average.y=[1., 1.01499998603016372556, 1.02999997206032745112, 1.04499995809049006645, 1.05999994412065468019, 1.07499998696149856592, 1.09000003539027146005, 1.10500001862644769979, 1.12000000745059891116, 1.13499998509881216968, 1.14999997392299713184, 1.1649999627471014918, 1.17999995157124604184, 1.1949999888241740198, 1.21000003725289517753, 1.22500001490111687374, 1.24000001490118783032, 1.25499999254940619586, 1.26999997019762433936, 1.28499997019769529594, 1.29999994784600247932, 1.31500006705488337033, 1.33000004470342148011, 1.34500003352765551412, 1.36000002235178163446, 1.375, 1.39000000000007095657, 1.40499995529643650904, 1.41999995529654299276, 1.43499995529657864424, 1.45000002980223352544, 1.46500002980230470406, 1.48000002980216249782, 1.4950000074506140102, 1.50999998509881216968, 1.52499998509888312626, 1.53999994039524867873, 1.55499994039560385239, 1.57000005960439614761, 1.58500003725289184686, 1.60000001490111687374, 1.61500001490118783032, 1.63000001490125878689, 1.64499997019762433936, 1.65999997019769529594, 1.67500000745061394802, 1.69000004470342135576, 1.70499998509881223185, 1.72000004470356349096, 1.73499999999992882138, 1.75, 1.7649999999998580158, 1.78000000000014213519, 1.79500001490118776815, 1.80999991059351250655, 1.82500001490076169119, 1.84000002980230470406, 1.85499998509867003449, 1.87000002980207358227, 1.88500002980193159807, 1.89999994039571040716, 1.91499994039556842296, 1.9299999403957104338, 1.9450000596042895662, 1.96000005960432499563, 1.97500001490111687374, 1.98999997019748220417, 2.00500001490047718988, 2.01999997019762433936, 2.03500008940703835947, 2.04999997019776625251, 2.06500008940664736556, 2.07999988079113684591, 2.0950000000002839684, 2.1099998807919893018, 2.125, 2.1400001192080106982, 2.15499995529643673109, 2.17000011920950264255, 2.18499995529657864424, 2.20000002980223374749, 2.21499991059296164053, 2.23000002980237566064, 2.24499998509952281012, 2.26000002980193137603, 2.27500005960499995794, 2.28999994039556842296, 2.30500005960471598954, 2.31999994039528401046, 2.33500005960443157704, 2.34999994039553294911, 2.36500001490118805236, 2.38000008940684271153, 2.39500001490132996551, 2.41000008940684296022, 2.42499992549406062636, 2.44000008940664736556, 2.45499988079113684591, 2.4700000000002839684, 2.4849998807919893018, 2.5]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_Bicubic.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_Bicubic.txt
deleted file mode 100644
index bc1ced97..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_Bicubic.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-last-generated=2015-06-29
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-bicubic.y=[93., 95.97262579974464813404, 99.01103224209813902235, 102.11598226656712995464, 105.28825407144468329079, 108.52862524481240313889, 111.83786818620278324943, 115.21674336770439595057, 118.66604676697680531561, 122.18653742701447129093, 125.77899878897706287262, 129.44419882948250233312, 133.18290811922020111524, 136.99591248414427013813, 140.8839719344246361743, 144.84786749222195112452, 148.88838341957193733833, 153.00627062040408077337, 157.20232851921423389285, 161.47731121126500397622, 165.83199942507135915548, 170.26716907749454321674, 174.78358513898527348829, 179.38204762813830939194, 184.06329599508930527918, 188.828125, 193.67731180202608243235, 198.61159745260181352933, 203.63180481735557236789, 208.73868228370011479456, 213.93299242319869790663, 219.21554438637286921221, 224.58707053083284677086, 230.04836315264225277133, 235.60021772806109652265, 241.24338108195698282543, 246.9786141792741318568, 252.80672938089830381614, 258.7284879580635106322, 264.74466811152217360359, 270.85598388339002440262, 277.06332621518140513217, 283.36734843097781322285, 289.76888577409613390046, 296.26873935678713678499, 302.86762268396552144623, 309.56633959148581425325, 316.365662438873357587, 323.26636489124877016366, 330.26921935663170870612, 337.375, 344.58447959128437787513, 351.89845157029969868745, 359.31764836110374972122, 366.84284875155412919412, 374.47487488402322242109, 382.21447568345115541888, 390.06241410713721506909, 398.01945308672907231085, 406.08641659358090691967, 414.2639879658061659029, 422.5530276294720124497, 430.95431115808145250412, 439.46857098682431796988, 448.09660057513292485964, 456.83913233636940276483, 465.69696761482435931612, 474.67091390068549117132, 483.76171221429984825591, 492.97015602098622366611, 502.2970082736423478309, 511.74303189762201782287, 521.30899348994705633231, 530.9956479359767627102, 540.80388464288171235239, 550.734375, 560.787912490264943699, 570.9652905494623382765, 581.26724160208641478675, 591.69449656085862443433, 602.24797319917286131385, 612.9284032030953994763, 623.73645798074630874908, 634.67305304890930983674, 645.73885979088663589209, 656.93460453038562718575, 668.26121419110768329119, 679.71935486281847715873, 691.3098810529849060913, 703.03352518610131483001, 714.89101967327428610588, 726.88314711904604337178, 739.01072185692692073644, 751.27452732214078423567, 763.6753569801749108592, 776.21388223319797816657, 788.89095755663799991453, 801.7072995984175349804, 814.66373250489220936288, 827.7610348191606135515, 841.]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_Biquadratic.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_Biquadratic.txt
deleted file mode 100644
index f70e2941..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_Biquadratic.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-biquadratic.y=[29., 29.62350083800476951978, 30.25399973845625467561, 30.8915005160516749072, 31.53599935615655525112, 32.18764109499733905295, 32.84600076026025305964, 33.51163862141955718243, 34.18399822903948148678, 34.86349844373630446626, 35.54999913445108461474, 36.24349979744593497344, 36.94400043315768300545, 37.651639747651032053, 38.36600108643760620453, 39.08750109415401396973, 39.81600215437166667698, 40.55163942474113980552, 41.2939981851852166983, 42.0434991726175226745, 42.79999901098052106363, 43.56349995403104458092, 44.33399972614124351367, 45.11164118620863661135, 45.89600033154220426468, 46.6875, 47.4860008272192288814, 48.29164036738842469276, 49.10399999444504715029, 49.92350074838893192464, 50.74999901140400027089, 51.58349970905914716468, 52.42400039105555720198, 53.27164092975968401333, 54.12599914434025549781, 54.98764089643950825348, 55.85599774652362015104, 56.73149829945844402346, 57.61399883590006965051, 58.50363916796408148002, 59.40000099027287916442, 60.30363878262030397082, 61.21400190133438456996, 62.13149958589517041219, 63.0559999772799599782, 63.98763819485994730485, 64.92600171753770155192, 65.8716393648385292181, 66.82399852401223938614, 67.78349975367204649501, 68.75, 69.72350404515476895995, 70.70400425985627634873, 71.69163882839690415949, 72.68599487083226051709, 73.68764294087714006309, 74.69599890456497348623, 75.71164091098547999081, 76.73400287310879264169, 77.76349910988351155083, 78.80000057388143375192, 79.84349673326856589028, 80.89399669015014637807, 81.95150044521740539949, 83.01600037013540145381, 84.08764202892865569083, 85.16599753220845059332, 86.25163793313306825894, 87.34400098709625126503, 88.44363811087961835256, 89.55000437663879608863, 90.66350032310161566329, 91.78399336836793054317, 92.91149686760775239236, 94.04599653505664491604, 95.1875, 96.33599963446208391815, 97.49164075482100599856, 98.65400266854391020388, 99.82364370953867194203, 100.99999859499270371543, 102.18364305805789626902, 103.37400140432609418895, 104.57163843980242745602, 105.77600414641619863687, 106.9875001566123273733, 108.20599953466491172094, 109.43150271019376873483, 110.66400205453194871552, 111.90350519701941323092, 113.15000450942476106775, 114.40363738191035736236, 115.66399935764430040308, 116.93163968908183392159, 118.20600158676853652651, 119.48763426840797308159, 120.77600375031977364415, 122.07149897105148284027, 123.37399805967136501295, 124.68350094578572395676, 126.]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_BooleanReplicator.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_BooleanReplicator.txt
deleted file mode 100644
index a6e7d964..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_BooleanReplicator.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-booRep.u=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
-time=[0., 600.]
-booRep.y[2]=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
-booRep.y[3]=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
-booRep.y[4]=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
-booRep.y[1]=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_IntegerReplicator.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_IntegerReplicator.txt
deleted file mode 100644
index e5e83b2c..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_IntegerReplicator.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-intRep.u=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5.]
-time=[0., 2.]
-intRep.y[2]=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5.]
-intRep.y[1]=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5., 5.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_IntegratorWithReset.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_IntegratorWithReset.txt
deleted file mode 100644
index 8bf6aa9d..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_IntegratorWithReset.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-last-generated=2016-09-30
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "4",
- "linear": " "
-}
-cons.y=[10., 10.]
-time=[0., 1.]
-booleanPulse.y=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0.99999403963644006854, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0.99998807927282451491, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
-intWitRes1.y=[2., 2.04999995343387020341, 2.09999990686773996273, 2.15000009872018615908, 2.20000005215405902703, 2.24999999627471369834, 2.29999995902179943386, 2.34999990314245099654, 2.40000010430810162276, 2.45000002980237585604, 2.49999999254944160754, 2.54999995529650735904, 2.59999991804357355463, 2.65000011920921840769, 2.70000004470349264096, 2.74999997019776643015, 2.79999997019762414396, 2.84999989569189837724, 2.90000005960475126798, 2.95000005960460942589, 2.99999998509888321507, 2.04999998509874092889, 2.09999991059301516216, 2.15000007450586805291, 2.20000007450572621082, 2.25, 2.29999999999985815791, 2.34999985098854802246, 2.40000008940698528193, 2.45000008940684255165, 2.49999994039553286029, 2.54999994039539057411, 2.59999994039524873202, 2.65000002980251769813, 2.70000002980237585604, 2.75000002980223356985, 2.7999998807909234344, 2.84999988079078159231, 2.90000011920921840769, 2.9500001192090765656, 2.99999997019776643015, 2.04999997019762414396, 2.09999997019748230187, 2.15000005960475126798, 2.20000005960460942589, 2.25000005960446713971, 2.29999991059315744835, 2.34999991059301516216, 2.40000014901145197754, 2.45000000000014228618, 2.5, 2.54999999999914761517, 2.59999999999829478625, 2.65000023841602150299, 2.69999994039727386763, 2.74999994039642103871, 2.79999994039521338252, 2.84999994039471538088, 2.90000017881244209761, 2.95000017881158926869, 2.99999988079284207743, 2.04999988079198924851, 2.09999988079113686368, 2.15000011920886313632, 2.20000011920801075149, 2.25000011920715792257, 2.29999982118841073131, 2.34999982118755790239, 2.40000005960528461912, 2.45000005960478661748, 2.50000005960357896129, 2.55000005960272613237, 2.59999976158397849701, 2.65000000000170521375, 2.70000000000085238483, 2.75, 2.79999999999914761517, 2.84999999999829478625, 2.90000023841602150299, 2.94999994039727386763, 2.99999994039642103871, 2.04999994039521338252, 2.09999994039471538088, 2.15000017881244209761, 2.20000017881158926869, 2.24999988079284207743, 2.29999988079198924851, 2.34999988079113686368, 2.40000011920886313632, 2.45000011920801075149, 2.50000011920715792257, 2.54999982118841073131, 2.59999982118755790239, 2.65000005960528461912, 2.70000005960478661748, 2.75000005960357896129, 2.80000005960272613237, 2.84999976158397849701, 2.90000000000170521375, 2.95000000000085238483, 3.]
-intWitRes1.y_reset=[2., 2.]
-intWitRes1.y_start=[5., 5.]
-intWitRes2.y_start=[-5., -5.]
-intWitRes2.y_reset_in=[-2., -2.00999999068678469882, -2.01999998137356939765, -2.02999997206035320829, -2.03999996274713879529, -2.04999995157128012124, -2.05999994412070774885, -2.0699999329447957841, -2.07999992549427403787, -2.08999991059329914833, -2.09999990314256335111, -2.10999989569189816407, -2.11999988824141105681, -2.13000011920893417283, -2.14000010430810183593, -2.15000008940670062074, -2.16000008940670085167, -2.17000007450572596213, -2.18000005960432519103, -2.19000005960446708642, -2.20000004470335053242, -2.21000004470299504788, -2.22000002980223376525, -2.23000001490097465862, -2.24000001490140077109, -2.25, -2.26000000000042611248, -2.26999997019719801372, -2.27999997019776623475, -2.28999997019805068277, -2.29999994039624322539, -2.30999994039553291358, -2.31999994039567480897, -2.32999991059400990423, -2.33999991059329914833, -2.34999991059329937926, -2.35999988079177613898, -2.36999988079106582717, -2.38000011920893417283, -2.39000011920822386102, -2.40000008940670062074, -2.41000008940670085167, -2.42000008940599009577, -2.43000005960432519103, -2.44000005960446708642, -2.45000005960375677461, -2.46000002980194931723, -2.47000002980223376525, -2.48000002980280198628, -2.48999999999957388752, -2.5, -2.51000000000028400393, -2.52000000000056845195, -2.53000000000085245588, -2.53999994039727372552, -2.54999994039642086108, -2.55999994039549738645, -2.56999994039556822756, -2.57999994039585267558, -2.58999994039613667951, -2.59999988079284216624, -2.6099998807919893018, -2.61999988079113688144, -2.63000011920886311856, -2.6400001192080106982, -2.65000011920715783376, -2.66000005960386332049, -2.67000005960414732442, -2.68000005960443177244, -2.69000005960450261355, -2.70000005960357913892, -2.71000005960272627448, -2.71999999999914754412, -2.72999999999943154805, -2.73999999999971599607, -2.75, -2.76000000000028400393, -2.77000000000056845195, -2.78000000000085245588, -2.78999994039727372552, -2.79999994039642086108, -2.80999994039549738645, -2.81999994039556822756, -2.82999994039585267558, -2.83999994039613667951, -2.84999988079284216624, -2.8599998807919893018, -2.86999988079113688144, -2.88000011920886311856, -2.8900001192080106982, -2.90000011920715783376, -2.91000005960386332049, -2.92000005960414732442, -2.93000005960443177244, -2.94000005960450261355, -2.95000005960357913892, -2.96000005960272627448, -2.96999999999914754412, -2.97999999999943154805, -2.98999999999971599607, -3.]
-intWitRes2.y=[-5., -4.94999980814757734038, -4.90000009313220630247, -4.84999990127989377697, -4.80000018626441349312, -4.75000000372537467541, -4.6999998025597813367, -4.65000009685751347632, -4.59999989569211109597, -4.55000020861577691988, -4.50000000745073602815, -4.44999980628498459367, -4.40000008195610714523, -4.34999988079134958241, -4.30000019371501540633, -4.25000002980294411259, -4.19999979138422308012, -4.15000010430788890403, -4.09999994039610093921, -4.05000017881368545858, -4.00000001490147205629, -2.15000006258497489142, -2.09999989867212155659, -2.0499999731778477674, -1.99999997317798983154, -1.95000004768371582031, -1.89999992847456833367, -1.85000007748587824707, -1.79999995827673076043, -1.74999995827687304661, -1.70000010728818296002, -1.64999998807903547338, -1.59999998807917753751, -1.55000001788119790014, -1.50000001788133996428, -1.45000001788148225046, -1.40000004768350283513, -1.35000004768364467722, -1.29999992847449719058, -1.24999992847463925472, -1.20000007748594939017, -2.3499998867512283951, -2.29999988675137023719, -2.25000003576268037264, -2.20000003576282221474, -2.15000003576296450092, -2.09999994635569509072, -2.0499999463558373769, -1.99999994635597966308, -1.95000009536728957649, -1.89999997615814208984, -1.84999997615899469672, -1.79999985695055775281, -1.74999985695141035968, -1.70000015497015777299, -1.65000003576172082909, -1.60000003576292870733, -1.54999991655413693614, -1.49999991655498954302, -1.44999991655584214989, -1.40000009536530023446, -2.55000002384057911087, -2.5000000238414314957, -2.45000002384228432462, -2.40000002384313670944, -2.3499997854254104368, -2.30000008344415762807, -2.25000008344501045698, -2.20000008344586284181, -2.15000008344636084345, -2.09999984502898939809, -2.04999984502984222701, -2.00000014304858986236, -1.95000014304944224719, -1.90000002384100530328, -1.85000002384185791016, -1.79999990463342096625, -1.74999990463427357312, -1.69999990463512618, -1.65000008344458404252, -1.6000000834454366494, -2.75000001192107079717, -2.70000001192156879881, -2.65000001192242118364, -2.599999773504694911, -2.55000007152344210226, -2.50000007152429493118, -2.45000007152514731601, -2.40000007152600014493, -2.34999983310827342819, -2.29999983310912625711, -2.25000013112787344838, -2.2000001311287262773, -2.15000013112957866213, -2.0999998927114975622, -2.0499998927127052184, -1.99999989271355804732, -1.95000019073230546063, -1.90000007152386851672, -1.85000007152472112359, -1.79999995231628417969]
-intNoReset.y=[1., 1.04999995343386998137, 1.10000002607702951352, 1.14999997951089638626, 1.20000005215405924908, 1.24999999627471392039, 1.29999995902179921181, 1.35000002235174076937, 1.39999998509881207198, 1.45000002980237563399, 1.49999999254944160754, 1.54999995529650758108, 1.60000003725286310541, 1.64999999999992907895, 1.70000004470349264096, 1.74999997019776643015, 1.79999997019762436601, 1.85000001490118792802, 1.8999999403954617172, 1.95000005960460920384, 1.99999998509888321507, 2.04999998509874092889, 2.09999991059301516216, 2.15000007450586805291, 2.20000007450572621082, 2.25, 2.29999999999985815791, 2.34999985098854802246, 2.40000008940698528193, 2.45000008940684255165, 2.49999994039553286029, 2.54999994039539057411, 2.59999994039524873202, 2.65000002980251769813, 2.70000002980237585604, 2.75000002980223356985, 2.7999998807909234344, 2.84999988079078159231, 2.90000011920921840769, 2.9500001192090765656, 2.99999997019776643015, 3.04999997019762414396, 3.09999997019748230187, 3.15000005960475126798, 3.20000005960460942589, 3.25000005960446713971, 3.29999991059315744835, 3.34999991059301516216, 3.40000014901145197754, 3.45000000000014228618, 3.5, 3.54999999999914761517, 3.59999999999829478625, 3.65000023841602150299, 3.69999994039727386763, 3.74999994039642103871, 3.79999994039521338252, 3.84999994039471538088, 3.90000017881244209761, 3.95000017881158926869, 3.99999988079284207743, 4.0500001192088630475, 4.09999988079170485378, 4.15000011920829514622, 4.1999998807911369525, 4.25000011921000009352, 4.30000005960386300075, 4.34999982118954786614, 4.40000005960443196784, 4.44999982118649217711, 4.50000005960500004676, 4.55000029801874728008, 4.59999976158738910215, 4.64999999999943192108, 4.69999976158341059573, 4.75, 4.80000023841658940427, 4.85000000000056807892, 4.90000023841261089785, 4.94999970198125271992, 4.99999994039499995324, 5.05000017881350782289, 5.09999994039556803216, 5.15000017881045213386, 5.19999994039613699925, 5.24999988078999990648, 5.3000001192088630475, 5.34999988079170485378, 5.40000011920829514622, 5.4499998807911369525, 5.50000011921000009352, 5.55000005960386300075, 5.59999982118954786614, 5.65000005960443196784, 5.69999982118649217711, 5.75000005960500004676, 5.80000029801874728008, 5.84999976158738910215, 5.89999999999943192108, 5.94999976158341059573, 6.]
-intNoReset.y_start=[1., 1.]
-intDef.y_start=[0., 0.]
-intDef.y=[0., 0.10000000372528947135, 0.20000000745057894269, 0.30000001862643776995, 0.40000001490115122404, 0.49999999254941662752, 0.6000000372528879744, 0.69999998509883665232, 0.8000000298022691414, 0.8999999403954617172, 0.99999998509888321507, 1.10000002980230471294, 1.20000007450572598877, 1.30000000000014215296, 1.3999999701976955091, 1.49999994039553286029, 1.6000000596045382828, 1.70000002980226927463, 1.7999998807909234344, 1.89999999999992907895, 1.99999997019776643015, 2.09999997019748230187, 2.20000005960460942589, 2.29999991059315744835, 2.40000014901145197754, 2.5, 2.59999999999971587172, 2.69999994039567514648, 2.7999999403953910182, 2.9000001788136855474, 2.99999988079106572059, 3.09999988079078159231, 3.2000001192090765656, 3.29999982118645673879, 3.40000005960475171207, 3.50000005960446713971, 3.59999976158184686881, 3.70000000000014228618, 3.79999999999985815791, 3.90000023841815313119, 3.99999994039553286029, 4.09999994039524828793, 4.19999994039496460374, 4.30000011920950253597, 4.40000011920921885178, 4.50000011920893427941, 4.59999982118631489669, 4.69999982118603032433, 4.80000029802290395509, 4.90000000000028457237, 5., 5.09999999999829523034, 5.1999999999965895725, 5.30000047683204300597, 5.39999988079454773526, 5.49999988079284207743, 5.59999988079042676503, 5.69999988078943076175, 5.80000035762488419522, 5.90000035762317853738, 5.99999976158568415485, 6.09999976158397849701, 6.19999976158227372736, 6.30000023841772627264, 6.40000023841602150299, 6.50000023841431584515, 6.59999964237682146262, 6.69999964237511580478, 6.80000011921056923825, 6.90000011920957323497, 7.00000011920715792257, 7.10000011920545226474, 7.19999952316795699403, 7.3000000000034104275, 7.40000000000170476966, 7.5, 7.59999999999829523034, 7.6999999999965895725, 7.80000047683204300597, 7.89999988079454773526, 7.99999988079284207743, 8.10000035762701564579, 8.19999988079113606432, 8.30000035762090426772, 8.39999988079227399851, 8.49999976157999981297, 8.60000023841772609501, 8.69999976158340970755, 8.80000023841659029245, 8.89999976158227390499, 9.00000023842000018703, 9.10000011920772600149, 9.19999964237909573228, 9.30000011920886393568, 9.39999964237298435421, 9.50000011921000009352, 9.60000059603749456016, 9.69999952317477820429, 9.79999999999886384217, 9.89999952316682119147, 10.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_InverseXRegularized.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_InverseXRegularized.txt
deleted file mode 100644
index 1e0ee661..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_InverseXRegularized.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-last-generated=2015-08-11
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-inverseXRegularized.y=[-1., -1.020408154001308354, -1.04166662790444397579, -1.06382978114919790613, -1.08695650312895564227, -1.11111116226150508091, -1.13636362900588427927, -1.16279065528761416104, -1.19047618421558754065, -1.21951221361174355629, -1.24999999536656014598, -1.28205132681383870974, -1.31578947047237693191, -1.35135139785821678515, -1.3888888336201408169, -1.42857143844084721884, -1.47058822280466161558, -1.51515149254140868429, -1.56249996529247359156, -1.61290324982803978671, -1.66666661048315978277, -1.72413794151115817854, -1.78571427634167756437, -1.85185179253943577038, -1.92307690804246500527, -2., -2.08333333734054937381, -2.17391290148166183016, -2.27272723884888350199, -2.38095245376647390856, -2.49999985246462630428, -2.63157888959393426731, -2.77777778343346559708, -2.94117619025939802668, -3.1249999310134040087, -3.3333333881051716574, -3.57142817758306252429, -3.84615359717639382353, -4.16666667609536034433, -4.5454551041717961013, -4.99999970782115710222, -5.55555556940270900412, -6.25000105072061362677, -7.14285636516088295878, -8.33333335799669505661, -10.00000229428100340101, -9.98720172517202442464, -6.2303997446881158595, -3.99999785423662856942, -2.00000190734522398373, 0., 2.00000190731680271838, 4.00000381463360543677, 6.23041006312160217107, 9.98719270875852593861, 10.00000229424680497914, 8.33333335800179142439, 7.14285636517146205193, 6.24999872797041344796, 5.55555375995786793197, 5.00000121640015215974, 4.54545510416282461108, 4.1666666760928512403, 3.84615359717846416743, 3.57142817758842356923, 3.33333273102355676087, 3.12500051870276385202, 2.94117670666565667048, 2.77777778343180159482, 2.63157888959344798963, 2.49999985246682543405, 2.3809521172599814598, 2.27272754931886877827, 2.17391318387136855961, 2.08333333733930547993, 2., 1.92307679805917608462, 1.8518516910902842465, 1.78571408751781457447, 1.72413803071681526191, 1.66666669360146446621, 1.61290324982822563804, 1.56249996529299095549, 1.5151514245384125612, 1.47058809447640248536, 1.42857156050256750568, 1.38888889140426230462, 1.35135139785795588274, 1.31578944471152059492, 1.28205127805932361795, 1.2499999258660678958, 1.21951230258555121111, 1.19047622665373431516, 1.16279067552180270795, 1.13636361939678143251, 1.11111113478931011755, 1.08695645052415756915, 1.06382984465896202053, 1.04166666849571476483, 1.02040817347483780964, 1.]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_Polynominal.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_Polynominal.txt
deleted file mode 100644
index b926c5dd..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_Polynominal.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-polynominal.y=[1., 1.01999998137355607497, 1.0399999627471119279, 1.0599999441206666706, 1.08000004470348698327, 1.09999996274709421762, 1.12000000745054562046, 1.14000004470348148544, 1.15999997019768419371, 1.17999994039546174385, 1.20000004470347798602, 1.22000002980230459748, 1.24000001490108124891, 1.26000004470346360641, 1.27999997019767319806, 1.2999999403955329047, 1.32000005960453825615, 1.33999997019767769224, 1.35999999999978671283, 1.37999999999992906119, 1.39999997019767752349, 1.4199999701978729405, 1.44000005960460919496, 1.45999998509886319553, 1.48000002980216249782, 1.5, 1.52000000000000001776, 1.54000000000000003553, 1.55999994039539080504, 1.58000005960439615649, 1.59999999999964481745, 1.62000000000007116085, 1.64000000000000012434, 1.66000002980234917516, 1.67999994039546196589, 1.69999999999999995559, 1.71999999999957364771, 1.73999999999985788257, 1.76000000000014211743, 1.78000002980231353256, 1.7999999403955329047, 1.81999999999999984013, 1.84000005960425405682, 1.85999999999978671283, 1.87999999999992906119, 1.90000002980227788996, 1.91999994039535515356, 1.93999999999999994671, 1.96000005960432499563, 1.97999999999971576514, 2., 2.01999999999943158357, 2.04000000000056846972, 2.05999994039539080504, 2.07999988079135000874, 2.10000005960517777126, 2.11999988079078161007, 2.13999994039468033336, 2.16000011920829493306, 2.18000011920772651663, 2.20000000000142081902, 2.22000000000085240259, 2.24000000000028398617, 2.25999999999971601383, 2.28000000000042613024, 2.29999994039553268266, 2.31999988079149188636, 2.34000005960503543179, 2.35999988079092393178, 2.38000000000014200197, 2.4000001192089341906, 2.4200001192080105028, 2.44000000000170524928, 2.46000000000113683285, 2.48000000000056841643, 2.5, 2.51999999999943158357, 2.53999994039567500437, 2.56000000000085270457, 2.5800000596048935364, 2.5999998807910658094, 2.61999999999985799803, 2.64000011920907651231, 2.65999994039496456821, 2.68000011920772651663, 2.70000000000142081902, 2.72000000000085240259, 2.74000000000028398617, 2.75999999999971601383, 2.77999999999914759741, 2.8000000000007103651, 2.81999994039524892742, 2.83999988079120768703, 2.86000005960531966664, 2.88000011920921838993, 2.89999994039482222874, 2.9200001192080105028, 2.94000000000170524928, 2.96000000000113683285, 2.98000000000056841643, 3.]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_PowerLinearized.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_PowerLinearized.txt
deleted file mode 100644
index 8ab0267a..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_PowerLinearized.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-powerLinearized.y=[-0.25, -0.23999999441206579243, -0.23000000372528947579, -0.21999999813735424126, -0.20999999254942106064, -0.20000000372529169734, -0.18999999627470720576, -0.17999999999999999334, -0.16999999999999668154, -0.16000000000000000333, -0.15000000745057781582, -0.14000000000000001332, -0.12999999254943939153, -0.12000000372529529002, -0.1100000000000010969, -0.10000000745055839801, -0.09000000000000665801, -0.08000000372528695558, -0.07000000745055395823, -0.05999999627471414021, -0.05000000372528473624, -0.0399999925494316233, -0.02999999813735818033, -0.01999999627470358532, -0.0099999944120770512, 0., 0.01000000931320799147, 0.01999998882414910639, 0.02999999813735765297, 0.04000000745056503382, 0.04999998882415129797, 0.05999999627471414021, 0.07000000745056728091, 0.08000000372530030601, 0.09000000000000668576, 0.10000000372527917403, 0.10999998509889208353, 0.1199999925494371622, 0.13000000000000000444, 0.13999999999999557243, 0.1500000000000000222, 0.16000000745056724982, 0.1700000149011611783, 0.17999999999999999334, 0.19000000000000000222, 0.19999999999997780664, 0.20999998509886991238, 0.21999999999999997335, 0.23000001490108124003, 0.23999998509890985154, 0.25, 0.26010001680353966869, 0.27040000761037902288, 0.2809040086746223408, 0.29159996584901359817, 0.30250402271750259642, 0.31360000105858365504, 0.32490396897801587794, 0.33640002163364923771, 0.34810003757874702357, 0.35999998574284602926, 0.37209997818989043461, 0.38440000420578757101, 0.39690000420557441929, 0.40960000802041041101, 0.42250398516656745285, 0.43559997802732192129, 0.44890402524470113255, 0.46239997966769602611, 0.47610400946145470247, 0.49000002627363214991, 0.5041000552122006928, 0.51839997230622714142, 0.53289994796820572276, 0.54759995719946330528, 0.5625, 0.57760001680353967313, 0.59290398495211049656, 0.6084000319669602419, 0.62410403616425647044, 0.63999996666907632559, 0.65610399456016932351, 0.67240000946996503206, 0.68890399544237868046, 0.70560006738067859722, 0.72249998574284601816, 0.73959997818967726513, 0.7569000042057876243, 0.77440000420557442151, 0.7921000377936826542, 0.81000004539467151954, 0.82810402567384611139, 0.84639999186518899421, 0.86490402858232329208, 0.8836000010585657316, 0.90250396311285763229, 0.92160002541019803157, 0.94089997230580080245, 0.96039994796848993097, 0.98009995719960540939, 1.]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_QuadraticLinear.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_QuadraticLinear.txt
deleted file mode 100644
index 105370ef..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_QuadraticLinear.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-quadraticLinear.y=[9., 9.32402992983701572882, 9.65624047833064302893, 9.99680998259017528085, 10.34591964082617643328, 10.70392796678445357372, 11.07048039658855564937, 11.44647501765454400413, 11.83135993331417878949, 12.22586998999242169361, 12.63000005378651380283, 13.04393007873819065878, 13.46784031003110015945, 13.90211665770720905755, 14.34632012560719083183, 14.80125018406884862543, 15.26688020463683237438, 15.74361124956431545741, 16.23096049401445739591, 16.729770780951394471, 17.23999961802919855813, 17.76182972297394968564, 18.2954407382907042745, 18.84125250779748839136, 19.39872009072480452119, 19.96875, 20.55127963197877960511, 21.14674598997959265034, 21.75456039763006543808, 22.37567000426004426572, 23.00999946635165471776, 23.65772994682024332747, 24.31904077833649324702, 24.9943887022759341221, 25.68312047962438526838, 26.38653606787175220916, 27.1036786224524846034, 27.8355900107660865217, 28.5821613099298694749, 29.3438701171341804752, 30.12000037374074423724, 30.91193799947210152368, 31.71864044421487349723, 32.54120958173036370908, 33.37952061839909845276, 34.23407147459678867563, 35.10407946988392069443, 35.99102030930658457919, 36.89376166072389651163, 37.81346804962410601547, 38.75, 39.70353027706632076388, 40.67424198691499270808, 41.66266047992623100527, 42.6679169897950814061, 43.69161027477083791837, 44.73247884592370837709, 45.79215189221316251178, 46.86936369420816816955, 47.96537308181264336326, 49.0799991557303556533, 50.21342686513560238382, 51.36584035871992170996, 52.5374113002430931374, 53.72832279855553139214, 54.93914340720004929608, 56.1688772209388176293, 57.4192941022063862988, 58.68896011630162234951, 59.97967941773038802467, 61.29000249519138066034, 62.62133314458908728284, 63.973434370713619046, 65.34650920587687039642, 66.7407213185150709478, 68.15625, 69.59327836038416137399, 71.05242762249919508122, 72.53256653586001334588, 74.03561909148874065068, 75.5599957328777946941, 77.10768090283522724349, 78.67704123428526941098, 80.27006701895987816897, 81.88512085027329590048, 83.52374637631612586119, 85.1856741839951610018, 86.87109294183669305767, 88.58016287007258426911, 90.31307470405725723595, 92.07000392401148758381, 93.8516165470906145174, 95.6566360735930629744, 97.48720967840628759404, 99.34152266316687018843, 101.22174878312765144983, 103.12608749369184124589, 105.0561849396611364682, 107.01175314758964418616, 108.992971428389267885, 111.]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_RegNonZeroPower.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_RegNonZeroPower.txt
deleted file mode 100644
index 13388da7..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_RegNonZeroPower.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-regNonZeroPower.y=[0.06562499701976776123, 0.10000000255679768191, 0.14142136430053506291, 0.17320507955265232458, 0.20000000516215651891, 0.22356205266973477874, 0.24494897100636037202, 0.26454812231957264279, 0.28284272863781406704, 0.30000000592696246526, 0.3162277615111021567, 0.33166247695730172174, 0.346410159151753827, 0.36054446921314464714, 0.3741657427871261099, 0.38729833784505418581, 0.40000001040319499435, 0.41230343065376645617, 0.4242640649189326485, 0.4358899024583438031, 0.44721358679628553379, 0.45825756309845439018, 0.46904158719013111511, 0.47957863255394178603, 0.48989794204626369023, 0.5, 0.50990195013850825312, 0.51961164634192125167, 0.52915024644338137794, 0.53851646958370336105, 0.54772256714829203883, 0.55677646184088736003, 0.56568545733309039125, 0.57445362365912755465, 0.58309518983352059962, 0.59160557893006471275, 0.60000001190433782661, 0.60827624405332247903, 0.61644143252384897558, 0.6244977409835704707, 0.63245552305849517261, 0.64031052868680549128, 0.64807410058566083944, 0.65574383189641283209, 0.66332495392066082029, 0.67081874386858908466, 0.67823302129293072671, 0.68556392279782407684, 0.69282031832756840739, 0.69999998126014828514, 0.70710676908493041992, 0.71414286565254847527, 0.72111029752804423065, 0.72800969995642528243, 0.73484693495002184616, 0.74161861552360663907, 0.74833148558292672536, 0.75498227765196390671, 0.76157731912559201159, 0.76811458386026287837, 0.77459667572870705143, 0.78102498330055303288, 0.7874007790780355176, 0.79372537436220258478, 0.80000002084774346489, 0.80622481930145584172, 0.8124038415422391024, 0.8185343822472412878, 0.82462113661358849015, 0.830661506895876256, 0.83666003461790672269, 0.84261496147322878514, 0.84852812987350167973, 0.85440038517750316327, 0.86023252647769665735, 0.86602538824081420898, 0.87177980492733542217, 0.8774956701657306013, 0.88317610450959727064, 0.88881874553898865265, 0.89442717361788415253, 0.8999993191825098604, 0.90553850329988616608, 0.91104271288268667828, 0.91651512622229303062, 0.92195444005414239896, 0.92736183825293772021, 0.93273788434818594162, 0.93808317438448762804, 0.94339812559648772439, 0.94868333402769466911, 0.95393863507800324975, 0.95916627966650114256, 0.96436454039922847592, 0.9695359480742499203, 0.97467886484289756321, 0.97979588410979034929, 0.98488573766959053302, 0.98994945515976662254, 0.994987423393662751, 1.]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_SmoothBlocks.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_SmoothBlocks.txt
deleted file mode 100644
index e84c98c2..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_SmoothBlocks.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2016-03-15
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-smoMax.y=[0., 0.47394565789714421244, 0.84432793770287428714, 0.99802672905342681986, 0.90482703717035473101, 0.55289051524443100227, 0.32820071887280383161, 0.42577928134743442401, 0.4817536869409441147, 0.5358267832061716085, 0.58778523637911683775, 0.63742399502753377405, 0.6845471385054687774, 0.72841560014943496082, 0.73850619237165282538, 0.90948542346774430278, 0.94113221293996107697, 0.83994783114300897164, 0.90482702252424618283, 0.92977649516155091991, 0.95105653411415636, 0.96858317659314352444, 0.98228722946472835087, 0.99211471927965522166, 0.99802673053509816103, 1., 0.99802669567686586038, 0.95002866167019506261, 0.99052846139873795828, 0.94276928963819872642, 0.93253975587575488326, 0.92977649516155091991, 0.90482703892538673962, 0.87630669226041957298, 0.84432793855642240821, 0.80901698037973335254, 0.77051329337862595192, 0.72896864067193822834, 0.67939733435349514146, 0.66430693991931155651, 0.93253968597909764338, 0.97858489945765181339, 0.73730097242588266138, 0.40191610642033659406, 0.368061469018954035, 0.30901693120370304912, 0.24868994060828003567, 0.18738130488501614224, 0.12533316773689304191, 0.06279058026677090953, -0.00000000000000042863, 0.4817540848915244367, 0.84432839882546162347, 0.99802674669317759104, 0.90482746775809963502, 0.58778571024716763649, 0.12527026117073328249, -0.39198811865748039995, -0.51496548734075742182, -0.53952921837713041509, -0.60630169544680379001, -0.65766460747946897669, -0.25383985884192117322, 0.24869011867385656944, 0.68454762484828057811, 0.95105685247321247733, 0.98228740967249039695, 0.77051373788308841206, 0.36812487168465324316, -0.12533335261201611344, -0.60630245747570987724, -0.93064114924206131629, -0.98978548126941179319, -0.88641439111626074698, -0.48175411370610260464, -0.00000000000000146958, 0.4817540848915244367, 0.84432839882546162347, 0.99802674669317759104, 0.90482746775809963502, 0.58778571024716763649, 0.12533335261201611344, -0.36812488808565585474, -0.80687247299867270733, -0.88548284015718048412, -0.85058812749099854678, -0.71655451481290122207, -0.24924315919586226276, 0.24869011867385656944, 0.68454762484828057811, 0.95105685247321247733, 0.98228740967249039695, 0.77051373788308841206, 0.36812487168465324316, -0.16525721490787897983, -0.34391156121828708736, -0.2486897591159555887, -0.18738148861113662624, -0.12533335346552829104, -0.07059858059156602639, -0.00000000000000110218]
-max.y=[0., 0.48175368668682239104, 0.84432793770287428714, 0.99802672905342681986, 0.90482703717035473101, 0.58778527312972128627, 0.36812455243550129547, 0.42577928134743442401, 0.4817536869409441147, 0.5358267832061716085, 0.58778523637911683775, 0.63742399502753377405, 0.6845471385054687774, 0.72896864067193822834, 0.77051323411742123071, 0.95105643327449074231, 0.98228718561161165734, 0.87630664754848952569, 0.90482703892538673962, 0.92977649516155091991, 0.95105653411415636, 0.96858317659314352444, 0.98228722946472835087, 0.99211471927965522166, 0.99802673053509816103, 1., 0.9980267244918734626, 0.99211473075717082626, 0.99802672187043806051, 0.96858315324141708302, 0.95105656270989080703, 0.92977649516155091991, 0.90482703892538673962, 0.87630669226041957298, 0.84432793855642240821, 0.80901698037973335254, 0.77051329337862595192, 0.72896864067193822834, 0.68454710432452448021, 0.68454762485570963548, 0.95105643327449129742, 0.98228718561161199041, 0.77051279157720375945, 0.42577940392674334946, 0.36812453065795114338, 0.30901693120370304912, 0.24868994060828003567, 0.18738130488501614224, 0.12533316773689304191, 0.06279058026677090953, 0.00000000000000012246, 0.4817540848915244367, 0.84432839882546162347, 0.99802674669317759104, 0.90482746775809963502, 0.58778571024716763649, 0.12533335261201611344, -0.36812479134814402038, -0.48175376869956793024, -0.53582694082383752754, -0.58778512224712653467, -0.63742392254515201078, -0.24869011867385656944, 0.24869011867385656944, 0.68454762484828057811, 0.95105685247321247733, 0.98228740967249039695, 0.77051373788308841206, 0.36812487168465324316, -0.12533335261201611344, -0.58778571024716763649, -0.90482746775809963502, -0.98228719331560565564, -0.84432839882546162347, -0.4817540848915244367, -0.00000000000000146958, 0.4817540848915244367, 0.84432839882546162347, 0.99802674669317759104, 0.90482746775809963502, 0.58778571024716763649, 0.12533335261201611344, -0.36812487168465324316, -0.77051373788308841206, -0.84432783747032003063, -0.80901708986911602395, -0.68454762484828057811, -0.24869011867385656944, 0.24869011867385656944, 0.68454762484828057811, 0.95105685247321247733, 0.98228740967249039695, 0.77051373788308841206, 0.36812487168465324316, -0.12533335261201611344, -0.30901693120476697585, -0.2486897591159555887, -0.18738148861113662624, -0.12533335346552829104, -0.06279058026588016372, -0.00000000000000024493]
-smoMax.u2=[0., 0.06279052189025491337, 0.12533323745214697276, 0.18738131638459501471, 0.24868989534003738129, 0.30901699812136379508, 0.36812455243550129547, 0.42577928134743442401, 0.4817536869409441147, 0.5358267832061716085, 0.58778523637911683775, 0.63742399502753377405, 0.6845471385054687774, 0.72896864067193822834, 0.77051323411742123071, 0.80901698037973324151, 0.84432793855642251923, 0.87630664754848952569, 0.90482703892538673962, 0.92977649516155091991, 0.95105653411415636, 0.96858317659314352444, 0.98228722946472835087, 0.99211471927965522166, 0.99802673053509816103, 1., 0.9980267244918734626, 0.99211473075717082626, 0.98228722946472835087, 0.96858315324141708302, 0.95105656270989080703, 0.92977649516155091991, 0.90482703892538673962, 0.87630669226041957298, 0.84432793855642240821, 0.80901698037973335254, 0.77051329337862595192, 0.72896864067193822834, 0.68454710432452448021, 0.6374239225441147294, 0.58778527414713988009, 0.53582678320617171952, 0.48175360468210237652, 0.42577932358903641807, 0.36812453065795114338, 0.30901693120370304912, 0.24868994060828003567, 0.18738130488501614224, 0.12533316773689304191, 0.06279058026677090953, 0.00000000000000012246, -0.06279058026588016372, -0.12533335346552829104, -0.187381488611136654, -0.2486897591159555887, -0.30901693120476697585, -0.36812453065774336514, -0.42577932358843195715, -0.48175376869956793024, -0.53582694082383752754, -0.58778512224712653467, -0.63742392254515201078, -0.68454710432485177396, -0.72896864067163469336, -0.77051329337777874073, -0.80901708986911602395, -0.84432783747032003063, -0.87630660193027931637, -0.9048270389256758417, -0.92977649516163163312, -0.95105656270955252207, -0.96858319930599690029, -0.98228719331560565564, -0.99211470696176862205, -0.99802672449193507997, -1., -0.99802672449193507997, -0.99211470696176862205, -0.98228719331560565564, -0.96858319930599690029, -0.95105656270955252207, -0.92977649516163163312, -0.9048270389256758417, -0.87630660193027931637, -0.84432783747032003063, -0.80901708986911602395, -0.77051329337777874073, -0.72896864067163469336, -0.68454710432485177396, -0.63742392254515201078, -0.58778512224712653467, -0.53582694082383752754, -0.48175376869956793024, -0.42577932358843195715, -0.36812453065774336514, -0.30901693120476697585, -0.2486897591159555887, -0.18738148861113662624, -0.12533335346552829104, -0.06279058026588016372, -0.00000000000000024493]
-smoMax.u1=[0., 0.48175368668682239104, 0.84432793770287428714, 0.99802672905342681986, 0.90482703717035473101, 0.58778527312972128627, 0.12533316747634798416, -0.36812453043866555369, -0.77051329024066239626, -0.98228718561161165734, -0.95105655954145384978, -0.68454710345963587503, -0.2486897578571945211, 0.24869011867726542597, 0.68454710345963631912, 0.95105643327449074231, 0.98228718561161165734, 0.77051329024066195217, 0.3681248716895293982, -0.12533335261026135043, -0.58778511857705484367, -0.90482718342467050032, -0.99802672187043783847, -0.8443280299287820867, -0.48175343471215154034, -0.00000000000000048986, 0.48175408489760052078, 0.84432761528830635456, 0.99802672187043806051, 0.90482686096303666101, 0.58778571025411763262, 0.12533335261026135043, -0.3681248716895293982, -0.77051279157720364843, -0.98228718561161199041, -0.95105643327449129742, -0.68454762485570963548, -0.24869011867726542597, 0.24869011867726542597, 0.68454762485570963548, 0.95105643327449129742, 0.98228718561161199041, 0.77051279157720375945, 0.3681248716895293982, -0.12533335261026135043, -0.58778571025411763262, -0.90482686096303666101, -0.99802672187043806051, -0.84432761528830635456, -0.48175408489760052078, -0.00000000000000097972, 0.4817540848915244367, 0.84432839882546162347, 0.99802674669317759104, 0.90482746775809963502, 0.58778571024716763649, 0.12533335261201611344, -0.36812487168465324316, -0.77051373788308841206, -0.98228740967249039695, -0.95105685247321247733, -0.68454762484828057811, -0.24869011867385656944, 0.24869011867385656944, 0.68454762484828057811, 0.95105685247321247733, 0.98228740967249039695, 0.77051373788308841206, 0.36812487168465324316, -0.12533335261201611344, -0.58778571024716763649, -0.90482746775809963502, -0.99802674669317759104, -0.84432839882546162347, -0.4817540848915244367, -0.00000000000000146958, 0.4817540848915244367, 0.84432839882546162347, 0.99802674669317759104, 0.90482746775809963502, 0.58778571024716763649, 0.12533335261201611344, -0.36812487168465324316, -0.77051373788308841206, -0.98228740967249039695, -0.95105685247321247733, -0.68454762484828057811, -0.24869011867385656944, 0.24869011867385656944, 0.68454762484828057811, 0.95105685247321247733, 0.98228740967249039695, 0.77051373788308841206, 0.36812487168465324316, -0.12533335261201611344, -0.58778571024716763649, -0.90482746775809963502, -0.99802674669317759104, -0.84432839882546162347, -0.4817540848915244367, -0.00000000000000195943]
-time=[0., 1.]
-Min.y=[0., 0.06279052189025491337, 0.12533323745214697276, 0.18738131638459501471, 0.24868989534003738129, 0.30901699812136379508, 0.12533316747634798416, -0.36812453043866555369, -0.77051329024066239626, -0.98228718561161165734, -0.95105655954145384978, -0.68454710345963587503, -0.2486897578571945211, 0.24869011867726542597, 0.68454710345963631912, 0.80901698037973324151, 0.84432793855642251923, 0.77051329024066195217, 0.3681248716895293982, -0.12533335261026135043, -0.58778511857705484367, -0.90482718342467050032, -0.99802672187043783847, -0.8443280299287820867, -0.48175343471215154034, -0.00000000000000048986, 0.48175408489760052078, 0.84432761528830635456, 0.98228722946472835087, 0.90482686096303666101, 0.58778571025411763262, 0.12533335261026135043, -0.3681248716895293982, -0.77051279157720364843, -0.98228718561161199041, -0.95105643327449129742, -0.68454762485570963548, -0.24869011867726542597, 0.24869011867726542597, 0.6374239225441147294, 0.58778527414713988009, 0.53582678320617171952, 0.48175360468210237652, 0.36812479135182246681, -0.12533335261026135043, -0.58778571025411763262, -0.90482686096303666101, -0.99802672187043806051, -0.84432761528830635456, -0.48175408489760052078, -0.00000000000000097972, -0.06279058026588016372, -0.12533335346552829104, -0.187381488611136654, -0.2486897591159555887, -0.30901693120476697585, -0.36812453065774336514, -0.42577940392494117994, -0.77051373788308841206, -0.98228740967249039695, -0.95105685247321247733, -0.68454762484828057811, -0.68454710432485177396, -0.72896864067163469336, -0.77051329337777874073, -0.80901708986911602395, -0.84432783747032003063, -0.87630660193027931637, -0.9048270389256758417, -0.92977649516163163312, -0.95105656270955252207, -0.96858319930599690029, -0.99802674669317759104, -0.99211470696176862205, -0.99802672449193507997, -1., -0.99802672449193507997, -0.99211470696176862205, -0.98228719331560565564, -0.96858319930599690029, -0.95105656270955252207, -0.92977649516163163312, -0.9048270389256758417, -0.87630660193027931637, -0.98228740967249039695, -0.95105685247321247733, -0.77051329337777874073, -0.72896864067163469336, -0.68454710432485177396, -0.63742392254515201078, -0.58778512224712653467, -0.53582694082383752754, -0.48175376869956793024, -0.42577932358843195715, -0.36812453065774336514, -0.58778571024716763649, -0.90482746775809963502, -0.99802674669317759104, -0.84432839882546162347, -0.4817540848915244367, -0.00000000000000195943]
-smoMin.y=[0., 0.07059855813051282847, 0.12533323745214697276, 0.18738131638459501471, 0.24868989534003738129, 0.34391172620433169138, 0.16525701594019534535, -0.36812453043866555369, -0.77051329024066239626, -0.98228718561161165734, -0.95105655954145384978, -0.68454710345963587503, -0.2486897578571945211, 0.24924315919969772248, 0.71655414520540483547, 0.85058799018647979207, 0.88548291122807309961, 0.80687216625068081122, 0.36812488809077648089, -0.12533335261026135043, -0.58778511857705484367, -0.90482718342467050032, -0.99802672187043783847, -0.8443280299287820867, -0.48175343471215154034, -0.00000000000000048986, 0.48175411371260806748, 0.88641368437528211821, 0.98978548993642845311, 0.93064072456625501761, 0.60630245748396394134, 0.12533335261026135043, -0.3681248716895293982, -0.77051279157720364843, -0.98228718561161199041, -0.95105643327449129742, -0.68454762485570963548, -0.24869011867726542597, 0.2538398588460433758, 0.65766460748051280838, 0.60630196183806639443, 0.53952906936013189654, 0.51496545363574586229, 0.3919881186604450285, -0.12527026116897740926, -0.58778571025411763262, -0.90482686096303666101, -0.99802672187043806051, -0.84432761528830635456, -0.48175408489760052078, -0.00000000000000042863, -0.06279058026588016372, -0.12533335346552829104, -0.187381488611136654, -0.2486897591159555887, -0.30901693120476697585, -0.3680614690187474225, -0.40191610641782060664, -0.7373020490434751828, -0.97858513211919739838, -0.93254021966960110035, -0.6643069399139636122, -0.67939733435453586452, -0.72896864067163469336, -0.77051329337777874073, -0.80901708986911602395, -0.84432783747032003063, -0.87630660193027931637, -0.9048270389256758417, -0.92977649516163163312, -0.93253975587672066627, -0.94276951782203510799, -0.99052845873937145349, -0.95002871467096949853, -0.99802669567735691203, -1., -0.99802672449193507997, -0.99211470696176862205, -0.98228719331560565564, -0.96858319930599690029, -0.95105656270955252207, -0.92977649516163163312, -0.90482702252477975602, -0.83994792641834514768, -0.94113240698562983244, -0.9094858148513299545, -0.73850640341315798576, -0.72841560014955797353, -0.68454710432485177396, -0.63742392254515201078, -0.58778512224712653467, -0.53582694082383752754, -0.48175376869956793024, -0.42577932358843195715, -0.32820068326305945616, -0.55289105043132513728, -0.90482746775809963502, -0.99802674669317759104, -0.84432839882546162347, -0.4739460920163836577, -0.00000000000000110218]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_SmoothExponential.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_SmoothExponential.txt
deleted file mode 100644
index 31b59017..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_SmoothExponential.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-smoothExponential.y=[0.36787945032119750977, 0.3753111066115173422, 0.38289287720649850533, 0.39062783174554638332, 0.39851903986952030845, 0.40657290755723318743, 0.41478291265384586994, 0.42316547010948424301, 0.43171051299611890029, 0.44043165130934552876, 0.44932895765443459091, 0.45840600187698288259, 0.46766641987408985592, 0.47711772960778697783, 0.4867522412719606506, 0.49658530359748942473, 0.50661701327783581483, 0.51685544663600979653, 0.52729242287301858472, 0.53794443864354424267, 0.54881161125529898115, 0.55989838382141532414, 0.57120907443130597425, 0.58275291705741272263, 0.59452057523885082357, 0.60653066635131835938, 0.61878342621341619889, 0.63128869371038021097, 0.64403641070970563121, 0.65704680587895480937, 0.67032001807757912726, 0.68386143120526499128, 0.69767631102294658252, 0.71177602068819789682, 0.72614901740611503822, 0.74082414198895896185, 0.75578371512607245286, 0.77105157833567328218, 0.78662789619632078608, 0.80252522134480319682, 0.81873076182050241734, 0.83527690769625662082, 0.85214378688894931724, 0.86935822914669480532, 0.88692045635551719496, 0.90495824257582491157, 0.92759422359867449437, 0.95418027355136980638, 0.9780646775599061149, 0.99427651182323983914, 1., 0.99427651182341514335, 0.97806461409638256743, 0.95418027355136980638, 0.92759430139768817014, 0.9049582147630594875, 0.88692045636404359676, 0.8693652248805341376, 0.85214373610986371421, 0.83527018227837979136, 0.81873081065915309651, 0.80251880800569486141, 0.78662789619620876458, 0.77105157833578263915, 0.75578371516891806881, 0.74082414198895907287, 0.72614906081992169895, 0.71177599947585656892, 0.6976763110229464715, 0.68386688502371195675, 0.670320018109198279, 0.65704676675114404016, 0.64403644916421876054, 0.63128366499113408583, 0.61878342618964998767, 0.60653066635131835938, 0.59452055753089150247, 0.58275292574099024634, 0.5712090405121250658, 0.55990283746894431438, 0.54881162765059521291, 0.53794873017289035477, 0.52729242288794009319, 0.51685546203943488752, 0.50661698311982084064, 0.49658533323150405581, 0.48675225580372766254, 0.47711390712800849645, 0.46766641290932825514, 0.45840598824080686091, 0.449328937648147686, 0.44043516797709897359, 0.43171052591375674856, 0.42316545119265541741, 0.41478290956913760335, 0.40657292270314371319, 0.39851902208607486999, 0.39062785361683899366, 0.38289289149870692208, 0.37531111361607055743, 0.36787945032119750977]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_SmoothHeaviside.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_SmoothHeaviside.txt
deleted file mode 100644
index ea2b653a..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_SmoothHeaviside.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-last-generated=2016-03-15
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-smoothHeaviside.y=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.00000000705717595365, 0.02799995987542714532, 0.10400001400944847152, 0.21600014327499084121, 0.35199986198448701691, 0.5, 0.64800013801348488318, 0.78400021508809036863, 0.8960002917812829315, 0.97199987686346533966, 0.99999999294300900843, 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_SmoothLimit.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_SmoothLimit.txt
deleted file mode 100644
index 7a65f682..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_SmoothLimit.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-smoLim.y=[0.00100000004749745131, 0.48175367905717336736, 0.49900001287460327148, 0.49900001287460327148, 0.49900001287460327148, 0.49900001287460327148, 0.12533316747634798416, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.24869011867726542597, 0.49900001287460327148, 0.49900001287460327148, 0.49900001287460327148, 0.49900001287460327148, 0.3681248716895293982, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.48175375936651615438, 0.49900001287460327148, 0.49900001287460327148, 0.49900001287460327148, 0.49900001287460327148, 0.12533335261026135043, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.24869011867726542597, 0.49900001287460327148, 0.49900001287460327148, 0.49900001287460327148, 0.49900001287460327148, 0.3681248716895293982, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.48175375936529074572, 0.49900001287460327148, 0.49900001287460327148, 0.49900001287460327148, 0.49900001287460327148, 0.12533335261201611344, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.24869011867385656944, 0.49900001287460327148, 0.49900001287460327148, 0.49900001287460327148, 0.49900001287460327148, 0.36812487168465324316, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.48175375936529074572, 0.49900001287460327148, 0.49900001287460327148, 0.49900001287460327148, 0.49900001287460327148, 0.12533335261201611344, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.24869011867385656944, 0.49900001287460327148, 0.49900001287460327148, 0.49900001287460327148, 0.49900001287460327148, 0.36812487168465324316, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131, 0.00100000004749745131]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_SmoothMin.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_SmoothMin.txt
new file mode 100644
index 00000000..a0d3716d
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_SmoothMin.txt
@@ -0,0 +1,10 @@
+last-generated=2016-03-15
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+smoLim[2].y=[0., 0.01000000000000000021, 0.02000000000000000042, 0.02999999999999999889, 0.04000000000000000083, 0.05000000000000000278, 0.05999999999999999778, 0.07000000000000000666, 0.08000000000000000167, 0.08999999999999999667, 0.10000000000000000555, 0.11000000000000000056, 0.11999999999999999556, 0.13000000000000000444, 0.14000000000000001332, 0.14999999999999999445, 0.16000000000000000333, 0.17000000000000001221, 0.17999999999999999334, 0.19000000000000000222, 0.2000000000000000111, 0.20999999999999999223, 0.22000000000000000111, 0.23000000000000000999, 0.23999999999999999112, 0.25, 0.26000000000000000888, 0.27000000000000001776, 0.28000000000000002665, 0.28999999999999998002, 0.2999999999999999889, 0.30999999999999999778, 0.32000000000000000666, 0.33000000000000001554, 0.34000000000000002442, 0.3499999999999999778, 0.35999999999999998668, 0.36999999999999999556, 0.38000000000000000444, 0.39000000000000001332, 0.4000000000000000222, 0.40999999999999997558, 0.41999999999999998446, 0.42999999999999999334, 0.44000000000000000222, 0.4500000000000000111, 0.46000000000000001998, 0.46999999999999997335, 0.48000000070007853292, 0.49156247465861574453, 0.5, 0.5015624746586381244, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5]
+smoLim[1].y=[0., 0.01000000000000000021, 0.02000000000000000042, 0.02999999999999999889, 0.04000000000000000083, 0.05000000000000000278, 0.05999999999999999778, 0.07000000000000000666, 0.08000000000000000167, 0.08999999999999999667, 0.10000000000000000555, 0.11000000000000000056, 0.11999999999999999556, 0.13000000000000000444, 0.14000000000000001332, 0.14999999999999999445, 0.16000000000000000333, 0.17000000000000001221, 0.17999999999999999334, 0.19000000000000000222, 0.2000000000000000111, 0.20999999999999999223, 0.22000000000000000111, 0.23000000000000000999, 0.23999999999999999112, 0.25, 0.26000000000000000888, 0.27000000000000001776, 0.28000000000000002665, 0.28999999999999998002, 0.2999999999999999889, 0.30999999999999999778, 0.32000000000000000666, 0.33000000000000001554, 0.34000000000000002442, 0.3499999999999999778, 0.35999999999999998668, 0.36999999999999999556, 0.38000000000000000444, 0.39000000000000001332, 0.4000000000000000222, 0.41065249251110347295, 0.42224000467145500481, 0.43425249190076770089, 0.44624001068963675687, 0.45781250139834528401, 0.4686399908993159058, 0.4784525047666767783, 0.48704002142306007661, 0.49425249658916786677, 0.5, 0.50425249658912008055, 0.50704002750927068544, 0.50845247692543849016, 0.50863999183400698811, 0.50781250139832445623, 0.50624001068964319394, 0.5042524919008963824, 0.50223999909298766564, 0.50065248912635917922, 0.50000000034816005634, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5]
+time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_Splice.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_Splice.txt
deleted file mode 100644
index c64e7dd3..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_Splice.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-splice.x=[0., 0.06279052189025491337, 0.12533323745214697276, 0.18738131638459501471, 0.24868989534003738129, 0.30901699812136379508, 0.36812455243550129547, 0.42577928134743442401, 0.4817536869409441147, 0.5358267832061716085, 0.58778523637911683775, 0.63742399502753377405, 0.6845471385054687774, 0.72896864067193822834, 0.77051323411742123071, 0.80901698037973324151, 0.84432793855642251923, 0.87630664754848952569, 0.90482703892538673962, 0.92977649516155091991, 0.95105653411415636, 0.96858317659314352444, 0.98228722946472835087, 0.99211471927965522166, 0.99802673053509816103, 1., 0.9980267244918734626, 0.99211473075717082626, 0.98228722946472835087, 0.96858315324141708302, 0.95105656270989080703, 0.92977649516155091991, 0.90482703892538673962, 0.87630669226041957298, 0.84432793855642240821, 0.80901698037973335254, 0.77051329337862595192, 0.72896864067193822834, 0.68454710432452448021, 0.6374239225441147294, 0.58778527414713988009, 0.53582678320617171952, 0.48175360468210237652, 0.42577932358903641807, 0.36812453065795114338, 0.30901693120370304912, 0.24868994060828003567, 0.18738130488501614224, 0.12533316773689304191, 0.06279058026677090953, 0.00000000000000012246, -0.06279058026588016372, -0.12533335346552829104, -0.187381488611136654, -0.2486897591159555887, -0.30901693120476697585, -0.36812453065774336514, -0.42577932358843195715, -0.48175376869956793024, -0.53582694082383752754, -0.58778512224712653467, -0.63742392254515201078, -0.68454710432485177396, -0.72896864067163469336, -0.77051329337777874073, -0.80901708986911602395, -0.84432783747032003063, -0.87630660193027931637, -0.9048270389256758417, -0.92977649516163163312, -0.95105656270955252207, -0.96858319930599690029, -0.98228719331560565564, -0.99211470696176862205, -0.99802672449193507997, -1., -0.99802672449193507997, -0.99211470696176862205, -0.98228719331560565564, -0.96858319930599690029, -0.95105656270955252207, -0.92977649516163163312, -0.9048270389256758417, -0.87630660193027931637, -0.84432783747032003063, -0.80901708986911602395, -0.77051329337777874073, -0.72896864067163469336, -0.68454710432485177396, -0.63742392254515201078, -0.58778512224712653467, -0.53582694082383752754, -0.48175376869956793024, -0.42577932358843195715, -0.36812453065774336514, -0.30901693120476697585, -0.2486897591159555887, -0.18738148861113662624, -0.12533335346552829104, -0.06279058026588016372, -0.00000000000000024493]
-splice.y=[0., 0.24552701945450775001, 0.45303446596794039181, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.49999999997461591628, 0.45303428672430084978, 0.24552724104547474226, 0.00000000000000044409, -0.2455272410420935858, -0.45303469193715362184, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.45303469193715362184, -0.2455272410420935858, -0.00000000000000094369]
-time=[0., 2.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_VectorFunctions.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_VectorFunctions.txt
deleted file mode 100644
index 9948eceb..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Examples_VectorFunctions.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-sine1.y=[0., 0.48175368668682239104, 0.84432793770287428714, 0.99802672905342681986, 0.90482703717035473101, 0.58778527312972128627, 0.12533316747634798416, -0.36812453043866555369, -0.77051329024066239626, -0.98228718561161165734, -0.95105655954145384978, -0.68454710345963587503, -0.2486897578571945211, 0.24869011867726542597, 0.68454710345963631912, 0.95105643327449074231, 0.98228718561161165734, 0.77051329024066195217, 0.3681248716895293982, -0.12533335261026135043, -0.58778511857705484367, -0.90482718342467050032, -0.99802672187043783847, -0.8443280299287820867, -0.48175343471215154034, -0.00000000000000048986, 0.48175408489760052078, 0.84432761528830635456, 0.99802672187043806051, 0.90482686096303666101, 0.58778571025411763262, 0.12533335261026135043, -0.3681248716895293982, -0.77051279157720364843, -0.98228718561161199041, -0.95105643327449129742, -0.68454762485570963548, -0.24869011867726542597, 0.24869011867726542597, 0.68454762485570963548, 0.95105643327449129742, 0.98228718561161199041, 0.77051279157720375945, 0.3681248716895293982, -0.12533335261026135043, -0.58778571025411763262, -0.90482686096303666101, -0.99802672187043806051, -0.84432761528830635456, -0.48175408489760052078, -0.00000000000000097972, 0.4817540848915244367, 0.84432839882546162347, 0.99802674669317759104, 0.90482746775809963502, 0.58778571024716763649, 0.12533335261201611344, -0.36812487168465324316, -0.77051373788308841206, -0.98228740967249039695, -0.95105685247321247733, -0.68454762484828057811, -0.24869011867385656944, 0.24869011867385656944, 0.68454762484828057811, 0.95105685247321247733, 0.98228740967249039695, 0.77051373788308841206, 0.36812487168465324316, -0.12533335261201611344, -0.58778571024716763649, -0.90482746775809963502, -0.99802674669317759104, -0.84432839882546162347, -0.4817540848915244367, -0.00000000000000146958, 0.4817540848915244367, 0.84432839882546162347, 0.99802674669317759104, 0.90482746775809963502, 0.58778571024716763649, 0.12533335261201611344, -0.36812487168465324316, -0.77051373788308841206, -0.98228740967249039695, -0.95105685247321247733, -0.68454762484828057811, -0.24869011867385656944, 0.24869011867385656944, 0.68454762484828057811, 0.95105685247321247733, 0.98228740967249039695, 0.77051373788308841206, 0.36812487168465324316, -0.12533335261201611344, -0.58778571024716763649, -0.90482746775809963502, -0.99802674669317759104, -0.84432839882546162347, -0.4817540848915244367, -0.00000000000000195943]
-sine.y=[0., 0.36812455233088164919, 0.68454713813200374073, 0.90482706820653402424, 0.99802672947688175764, 0.95105654767720482212, 0.77051320285812896493, 0.48175368676197222184, 0.12533316753318957115, -0.24868975818155408808, -0.58778519733958012328, -0.84432793794965577128, -0.98228724329423344752, -0.98228718780142887379, -0.84432793794965543821, -0.58778542062824812309, -0.24868975818155408808, 0.12533316753319007075, 0.48175343616735727403, 0.77051329115143418758, 0.95105650130020480404, 0.99802670382906610858, 0.90482703766630756537, 0.68454723678864193293, 0.36812435396157228151, 0.00000000000000036739, -0.36812487359559198374, -0.68454682129585409101, -0.90482703766630800946, -0.99802673653366547057, -0.95105666264965571521, -0.77051329115143418758, -0.48175343616735727403, -0.12533372231874356784, 0.24868975818155508728, 0.58778542062824734593, 0.84432762078608325496, 0.98228718780142887379, 0.98228718780142887379, 0.84432762078608325496, 0.58778542062824734593, 0.24868975818155508728, -0.12533372231874356784, -0.48175343616735727403, -0.77051329115143418758, -0.95105666264965571521, -0.99802673653366547057, -0.90482703766630800946, -0.68454682129585409101, -0.36812487359559198374, -0.00000000000000073479, 0.368124873590689905, 0.6845476314077579838, 0.90482748033556004152, 0.99802664746436697829, 0.95105666264782784403, 0.77051329115224698185, 0.48175343617094967819, 0.12533260808762458627, -0.24869083735658870093, -0.58778449762384366029, -0.84432762079064072047, -0.98228718780202950445, -0.98228718780202950445, -0.84432762079064072047, -0.58778449762384366029, -0.24869083735658870093, 0.12533260808762458627, 0.48175343617094967819, 0.77051329115224698185, 0.951056662647827733, 0.99802664746436697829, 0.90482748033556004152, 0.6845476314077579838, 0.368124873590689905, 0.00000000000000110218, -0.368124873590689905, -0.6845476314077579838, -0.90482748033556004152, -0.99802664746436697829, -0.95105666264782784403, -0.77051329115224698185, -0.48175343617094967819, -0.12533260808762458627, 0.24869083735658870093, 0.58778449762384366029, 0.84432762079064072047, 0.98228718780202950445, 0.98228718780202950445, 0.84432762079064072047, 0.58778449762384366029, 0.24869083735658870093, -0.12533260808762458627, -0.48175343617094967819, -0.77051329115224698185, -0.951056662647827733, -0.99802664746436697829, -0.90482748033556004152, -0.6845476314077579838, -0.368124873590689905, -0.00000000000000146958]
-maxVec.y=[0., 0.58778525480201837539, 0.95105654699296127141, 0.99802672905342681986, 0.99802672947688175764, 0.95105654767720482212, 0.77051320285812896493, 0.48175368676197222184, 0.12533316753318957115, -0.24868975818155408808, -0.00000009338034728801, 0.58778527282526682463, 0.95105658189589126206, 0.95105642979290949679, 0.68454712629318237305, 0.95105643327449074231, 0.98228718561161165734, 0.77051329024066195217, 0.48175359783013937953, 0.77051329115143418758, 0.95105650130020480404, 0.99802670382906610858, 0.95105655862726257155, 0.95105660516451984154, 0.58778495958978949076, 0.00000000000000061232, 0.48175408489760052078, 0.84432761528830635456, 0.99802672187043806051, 0.90482686096303666101, 0.58778571025411763262, 0.58778511758881557547, 0.95105665170177755563, 0.95105674477629209562, 0.58778541701141395759, 0.58778542062824734593, 0.84432762078608325496, 0.98228718780142887379, 0.98228718780142887379, 0.84432762078608325496, 0.95105643327449129742, 0.98228718561161199041, 0.95105674477629209562, 0.95105665170177755563, 0.58778511758881557547, -0.00000074704277876046, -0.58778480159076329503, -0.90482703766630800946, -0.68454682129585409101, -0.36812487359559198374, -0.00000000000000073479, 0.58778570537683705322, 0.95105683784636940725, 0.99802674669317759104, 0.99802664746436697829, 0.95105666264782784403, 0.77051329115224698185, 0.48175343617094967819, 0.12533260808762458627, -0.24869083735658870093, -0.00000149406329796875, 0.58778448560400875511, 0.95105642979455184971, 0.95105642979455184971, 0.68454762484828057811, 0.95105685247321247733, 0.98228740967249039695, 0.77051373788308841206, 0.48175359783132160052, 0.77051329115224698185, 0.951056662647827733, 0.99802664746436697829, 0.95105630072579594447, 0.95105683784636940725, 0.58778570537683705322, 0.00000000000000538968, 0.4817540848915244367, 0.84432839882546162347, 0.99802674669317759104, 0.90482746775809963502, 0.58778571024716763649, 0.58778511758693507971, 0.95105665170011244314, 0.9510561542500337584, 0.58778385361732155001, 0.58778449762384366029, 0.84432762079064072047, 0.98228718780202950445, 0.98228718780202950445, 0.84432762079064072047, 0.95105685247321247733, 0.98228740967249039695, 0.9510561542500337584, 0.95105665170011244314, 0.58778511758693496869, -0.00000074703164599343, -0.58778628211283434624, -0.90482705831527709961, -0.6845476314077579838, -0.368124873590689905, -0.00000000000000146958]
-minVec.y=[0., 0.36812455233088164919, 0.68454713813200374073, 0.90482705831527709961, 0.58778519658824079919, 0.00000004669026060222, -0.58778530887192459442, -0.95105653312361848606, -0.95105649868006580938, -0.98228718561161165734, -0.95105655954145384978, -0.84432793794965577128, -0.98228724329423344752, -0.98228718780142887379, -0.84432793794965543821, -0.58778542062824812309, -0.58778541701141528986, -0.95105649868006614245, -0.95105665170177755563, -0.58778511758881557547, -0.58778511857705484367, -0.90482718342467050032, -0.99802672187043783847, -0.8443280299287820867, -0.48175343471215154034, -0.00000000000000048986, -0.58778570538371233134, -0.95105629201859742672, -0.95105655862726212746, -0.99802673653366547057, -0.95105666264965571521, -0.77051329115143418758, -0.48175359783013937953, -0.77051279157720364843, -0.98228718561161199041, -0.95105643327449129742, -0.68454762485570963548, -0.95105642979290949679, -0.95105642979290949679, -0.58778448559270801699, -0.00000037352138915203, 0.24868975818155508728, -0.12533372231874356784, -0.48175343616735727403, -0.77051329115143418758, -0.95105666264965571521, -0.99802673653366547057, -0.99802672187043806051, -0.95105629201859742672, -0.58778570538371233134, -0.00000000000000122465, 0.368124873590689905, 0.6845476314077579838, 0.90482705831527709961, 0.58778628211283434624, 0.00000074703164257284, -0.58778511758693507971, -0.95105665170011244314, -0.9510561542500337584, -0.98228740967249039695, -0.95105685247321247733, -0.84432762079064072047, -0.98228718780202950445, -0.98228718780202950445, -0.84432762079064072047, -0.58778449762384366029, -0.58778385361732143899, -0.9510561542500337584, -0.95105665170011244314, -0.58778511758693496869, -0.58778571024716763649, -0.90482746775809963502, -0.99802674669317759104, -0.84432839882546162347, -0.4817540848915244367, -0.00000000000000146958, -0.58778570537683705322, -0.95105683784636940725, -0.95105630072579594447, -0.99802664746436697829, -0.95105666264782784403, -0.77051329115224698185, -0.48175359783132160052, -0.77051373788308841206, -0.98228740967249039695, -0.95105685247321247733, -0.68454762484828057811, -0.95105642979455184971, -0.95105642979455184971, -0.58778448560400875511, 0.00000149406329428803, 0.24869083735658870093, -0.12533260808762458627, -0.48175343617094967819, -0.77051329115224698185, -0.951056662647827733, -0.99802664746436697829, -0.99802674669317759104, -0.95105683784636940725, -0.58778570537683705322, -0.00000000000000244929]
-time=[0., 1.]
-aveVec.y=[0., 0.47922117454067719722, 0.82664383453952094971, 0.95130342072270368536, 0.83021298774515461805, 0.51294728916573073541, 0.10268702048752285927, -0.27914245893343653249, -0.53207888869698960477, -0.60625410039998761658, -0.51294728342046402858, -0.31369657959390967461, -0.09330682380315366564, 0.07248643865509339645, 0.14266814114468936991, 0.12109044963830981056, 0.04860400968170237868, -0.0184033382764031625, -0.03372610468090058572, 0.01913160698412056868, 0.12109038623653245459, 0.22699503216767408231, 0.28595227160617436857, 0.26375859407403978718, 0.15805196458008383131, 0.00000000000000016329, -0.15805216966093127429, -0.26375848940794094366, -0.28595227160617431306, -0.22699489735420513847, -0.12109055406196783666, -0.01913160698412056521, 0.03372610468090058572, 0.01840340160117752422, -0.04860400968170259378, -0.12109044963830967179, -0.14266815825372439197, -0.07248643865509339645, 0.09330697627992007304, 0.31369691008239625196, 0.51294716012707242125, 0.60625410039998761658, 0.53207861957931423813, 0.27914269574131655993, -0.10268717539096591795, -0.51294770664888067468, -0.83021279969578032354, -0.95130341951978780735, -0.82664353646470256631, -0.47922156455955289278, -0.00000000000000097972, 0.47922156455360181981, 0.82664424962362259564, 0.9513033487107213082, 0.83021346577843369019, 0.51294770664224298429, 0.1026871753924486208, -0.27914269573793865087, -0.5320791095828278916, -0.60625401368032472149, -0.51294761472017680326, -0.31369691007767214197, -0.09330697627843652364, 0.07248643865430436095, 0.14266815825349582481, 0.12109027451129331099, 0.04860424577496169629, -0.01840326073418170616, -0.03372610468077344437, 0.01913160698443342952, 0.12109055405996346777, 0.22699515890664773154, 0.28595218424803442447, 0.26375868020887588417, 0.15805216965903090554, 0.0000000000000016741, -0.15805216965903090554, -0.26375868020887588417, -0.28595218424803442447, -0.22699515890664773154, -0.12109055405996346777, -0.01913160698443343299, 0.03372610468077344437, 0.01840326073418170616, -0.04860424577496169629, -0.12109027451129331099, -0.14266815825349582481, -0.07248643865430436095, 0.09330697627843652364, 0.31369691007767214197, 0.51294761472017680326, 0.60625401368032472149, 0.5320791095828278916, 0.27914269573793865087, -0.1026871753924486208, -0.51294770664224298429, -0.83021346577843357917, -0.9513033487107213082, -0.82664424962362259564, -0.47922156455360181981, -0.00000000000000195943]
-sine2.y=[0., 0.58778525480201837539, 0.95105654699296127141, 0.95105652451273503534, 0.58778519658824079919, 0.00000004669026060222, -0.58778530887192459442, -0.95105653312361848606, -0.95105649868006580938, -0.58778541701141528986, -0.00000009338034728801, 0.58778527282526682463, 0.95105658189589126206, 0.95105642979290949679, 0.58778527282526615849, 0.00000037352139029001, -0.58778541701141528986, -0.95105649868006614245, -0.95105665170177755563, -0.58778511758881557547, -0.00000018676069460377, 0.58778556119756308895, 0.95105655862726257155, 0.95105660516451984154, 0.58778495958978949076, 0.00000000000000061232, -0.58778570538371233134, -0.95105629201859742672, -0.95105655862726212746, -0.58778480159076329503, -0.00000074704278058002, 0.58778511758881557547, 0.95105665170177755563, 0.95105674477629209562, 0.58778541701141395759, -0.00000037352139088743, -0.58778448559270801699, -0.95105642979290949679, -0.95105642979290949679, -0.58778448559270801699, -0.00000037352138915203, 0.58778541701141395759, 0.95105674477629209562, 0.95105665170177755563, 0.58778511758881557547, -0.00000074704277876046, -0.58778480159076329503, -0.95105655862726212746, -0.95105629201859742672, -0.58778570538371233134, -0.00000000000000122465, 0.58778570537683705322, 0.95105683784636940725, 0.95105587870551311358, 0.58778628211283434624, 0.00000074703164257284, -0.58778511758693507971, -0.95105665170011244314, -0.9510561542500337584, -0.58778385361732155001, -0.00000149406329796875, 0.58778448560400875511, 0.95105642979455184971, 0.95105642979455184971, 0.58778448560400875511, -0.00000149406329845302, -0.58778385361732143899, -0.9510561542500337584, -0.95105665170011244314, -0.58778511758693496869, 0.00000074703165015844, 0.58778628211283434624, 0.95105587870551311358, 0.95105683784636940725, 0.58778570537683705322, 0.00000000000000538968, -0.58778570537683705322, -0.95105683784636940725, -0.95105587870551311358, -0.58778628211283434624, -0.00000074703164673617, 0.58778511758693507971, 0.95105665170011244314, 0.9510561542500337584, 0.58778385361732155001, 0.00000149406330213209, -0.58778448560400875511, -0.95105642979455184971, -0.95105642979455184971, -0.58778448560400875511, 0.00000149406329428803, 0.58778385361732143899, 0.9510561542500337584, 0.95105665170011244314, 0.58778511758693496869, -0.00000074703164599343, -0.58778628211283434624, -0.95105587870551311358, -0.95105683784636940725, -0.58778570537683705322, -0.00000000000000244929]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_CubicHermite.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_CubicHermite.txt
deleted file mode 100644
index 13d8a9bb..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_CubicHermite.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-y=[-1.5, -1.41600000670551762205, -1.33200001341103546615, -1.24800002011655841727, -1.1640000268220709323, -1.08000004917380354463, -0.99599700034442417707, -0.91061187047831537722, -0.82293002207643461965, -0.73328492296349723212, -0.64200974879369065995, -0.54943811337931747207, -0.4559032664986824579, -0.36173869638662969894, -0.26727787223452903476, -0.17285406251476923001, -0.0788005553420950966, 0.01454897517928377751, 0.10686127234654366203, 0.19780307173073469196, 0.28704071388366458883, 0.37424108053091620363, 0.45907048383476956044, 0.54119571645590369702, 0.62028340661901770758, 0.69599997997283935547, 0.76801229204446785914, 0.83598660272224589729, 0.89958988883800206082, 0.95848863023556185592, 1.0120396014960497677, 1.05279277931613779451, 1.07839847822169021541, 1.08980130369259753387, 1.08794594058943006054, 1.07377694777183019248, 1.04823903540451945915, 1.01227678771268303493, 0.96683464016250930673, 0.91285744855531403275, 0.85128990672651405625, 0.78307632024813744742, 0.70916147874402768458, 0.63049024129905439917, 0.54800675288326583523, 0.46265588801468349178, 0.37538252648240855169, 0.28713076252666552834, 0.19884548592504222575, 0.11147157183434619476, 0.02595312520861625671, -0.05676496639446312886, -0.135738071315993164, -0.21002157989356171064, -0.27867046701668329867, -0.34074093793494025784, -0.39528791873181656769, -0.44136682075136818293, -0.47803296785762444676, -0.50434183274813226827, -0.51934859690838852675, -0.52210891585121954606, -0.51167804762546542641, -0.48711131407581842456, -0.44746412762126908103, -0.39179184269503625204, -0.31915032892396966169, -0.22859410896984760919, -0.11917892284397516023, 0.01003984196918738039, 0.16000682154722742356, 0.33166662831065524264, 0.52596266438910888041, 0.74384186976472121966, 0.98624777561313348162, 1.25412499904632568359, 1.54841822200090795114, 1.87007193752195655101, 2.23491240944263491741, 2.69459546319469733788, 3.24133827895135029351, 3.86135777329662754909, 4.54087355790459756832, 5.26610546733916695672, 6.02327262705730337444, 6.79859023269962392533, 7.57828696519069744397, 8.34857808913809407159, 9.09568344455560406914, 9.80582239420604828695, 10.4800011443864438121, 11.15199866488097057982, 11.82399923707646571813, 12.49599980927196085645, 13.16800038147108686815, 13.84000095365726146213, 14.51200152585844094233, 15.18399809267864952744, 15.85599866487414466576, 16.52799923707418727759, 17.200000762939453125]
-yMonotone=[-1.5, -1.41600000670551762205, -1.33200001341103546615, -1.24800002011655841727, -1.1640000268220709323, -1.08000004917380354463, -0.99599288755311132793, -0.90871423749863122765, -0.81599913317624395148, -0.71863672698678660034, -0.61741609909747818818, -0.51312648619511269654, -0.4065570542720652325, -0.2984969992127216587, -0.1897355084927401514, -0.08106172588417821789, 0.02673536637667587451, 0.13286628926844076815, 0.23654201745691169623, 0.33697354153093306284, 0.4333714262857850108, 0.52494674752212922009, 0.61091006782637580219, 0.69047233237704941367, 0.76284459885338851137, 0.82723736763000488281, 0.88286172153057695944, 0.9289282109158341072, 0.96464800460438537844, 0.98923172031464057241, 1.00222562630954703522, 1.01112496647343585998, 1.01935875978635981376, 1.02700578191919178472, 1.0341445182724038343, 1.04085362344155574199, 1.04721187653099812032, 1.05329799366177789821, 1.05919039526502856141, 1.06496799813684828173, 1.07070922509081589702, 1.07649290770660432948, 1.08239758802996099973, 1.0885019258000543374, 1.09488475479696178994, 1.10162449716166310765, 1.10879992823860895612, 1.11648976898585572393, 1.12477243877206478651, 1.13372694564602127798, 1.14343166351318359375, 1.1539652453098403484, 1.16540660766652148794, 1.17783419052255333703, 1.19132658828876891732, 1.20596275912225037175, 1.22182106581534055678, 1.23898030612998422129, 1.25751915831630500797, 1.27751618146079248817, 1.29904992063715885031, 1.32219931056875705799, 1.34704302523605434772, 1.37365950475402009978, 1.40212742750102203892, 1.43252559087401154514, 1.46493235456483450463, 1.49942678274360163826, 1.53608736690603109309, 1.57499266631300383068, 1.61622147876874189265, 1.65985248230715431994, 1.70596383441341825637, 1.75463488156812186247, 1.80594415437445121597, 1.85996997356414794922, 1.9167912564588152069, 1.97648668089511247992, 2.07679377424796918206, 2.35109493901743560329, 2.78846848440390759905, 3.36310061851801256338, 4.0491781770521120265, 4.82088892031347970857, 5.65241942799988095203, 6.5179517914566389436, 7.3916842401510471916, 8.24779851777200789797, 9.06048144114140008298, 9.80392077997213640117, 10.4800011443864438121, 11.15199866488097057982, 11.82399923707646571813, 12.49599980927196085645, 13.16800038147108686815, 13.84000095365726146213, 14.51200152585844094233, 15.18399809267864952744, 15.85599866487414466576, 16.52799923707418727759, 17.200000762939453125]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_InverseXDerivativeCheck.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_InverseXDerivativeCheck.txt
new file mode 100644
index 00000000..c8c2f553
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_InverseXDerivativeCheck.txt
@@ -0,0 +1,11 @@
+last-generated=2015-08-11
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "1",
+ "linear": " "
+}
+y=[-0.25, -0.2656206346952070807, -0.28257013468395703049, -0.3009930230319615152, -0.32105286691799839183, -0.34293550531793004499, -0.3668529332191972081, -0.39304717374719444489, -0.42179565688622966402, -0.45341767685801909193, -0.48828127204791871296, -0.52681261523429412374, -0.56950722003360032542, -0.6169427278366947931, -0.66979601112681297348, -0.72886296405394201958, -0.79508450185816170741, -0.86957739355876473297, -0.95367425324857890701, -1.04897453852593258716, -1.15740754282606506109, -1.28131521759110755809, -1.42356051833644947635, -1.52711104228088734303, -1.43374387643531564507, -1.20400512218475341797, -0.9683593467425540835, -0.80157632485524776822, -0.69537962623701132792, -0.60480004307495760507, -0.52244893384396540181, -0.44793470417823144647, -0.38086526076216242753, -0.32084896159945830441, -0.26749389199657830352, -0.22040813058829233917, -0.17919999135411154856, -0.14347756022079799498, -0.11284898990883757142, -0.08692245329258935227, -0.06530611675939466954, -0.04760815765762700658, -0.03343673652794956763, -0.02239999892329162107, -0.01410612375463491351, -0.00816326460207627766, -0.0041795920731759759, -0.00176326547340185263, -0.00052244901098621793, -0.00006530612685498089, -0., 0.00006530612685498088, 0.00052244901098621793, 0.00176326547340185263, 0.00417959207317599411, 0.00816326460207630368, 0.01410612375463495341, 0.02239999892329156903, 0.0334367365279494913, 0.04760815765762692331, 0.06530611675939466954, 0.08692245329258935227, 0.11284898990883757142, 0.14347756022079799498, 0.17919999135411154856, 0.22040813058829233917, 0.26749389199657858107, 0.32084896159945858196, 0.38086526076216281611, 0.44793470417823105789, 0.52244893384396495772, 0.60480004307495704996, 0.69537962623701121689, 0.80157632485524776822, 0.9683593467425540835, 1.20400512218475341797, 1.43374387643531564507, 1.52711104228088734303, 1.42356051833644947635, 1.28131521759110755809, 1.15740754282606439496, 1.04897453852593214307, 0.95367425324857946212, 0.86957739355876473297, 0.79508450185816170741, 0.72886296405394201958, 0.66979601112681297348, 0.6169427278366947931, 0.56950722003360032542, 0.52681261523429412374, 0.48828127204791871296, 0.45341767685801909193, 0.42179565688622949748, 0.39304717374719427836, 0.36685293321919731913, 0.34293550531793015601, 0.32105286691799850285, 0.3009930230319615152, 0.28257013468395703049, 0.2656206346952070807, 0.25]
+y_comp=[-0.25, -0.2656206644975294684, -0.28257019428860180588, -0.30099308263660629059, -0.32105292652264316722, -0.34293559472489720807, -0.36685302262616437119, -0.39304726315416160798, -0.4217957462931968271, -0.45341776626498625502, -0.48828136145488587605, -0.52681267483936522478, -0.56950727963838720935, -0.61694284704584223533, -0.66979613033610252426, -0.72886302365858679497, -0.79508462106745125819, -0.86957751276766348525, -0.95367437245786845779, -1.04897465773522213794, -1.15740766203535461187, -1.28131545600918927974, -1.42356075675495752364, -1.52711128069946644459, -1.43374423406261586322, -1.20400547981262207031, -0.96835970437010299161, -0.80157662287847164517, -0.69537992426023520487, -0.60480040070282625742, -0.52244929147174523631, -0.44793503200377771112, -0.38086558858770869218, -0.32084928942500456905, -0.26749421982212456816, -0.22040845841383860382, -0.17920031917965781321, -0.14347788804634425963, -0.11284931028380323914, -0.08692277366755501999, -0.06530643713436033726, -0.0476084780325926743, -0.03343705690291523536, -0.02240031929825728879, -0.01410644319827800662, -0.00816358497704177191, -0.00417991198248035632, -0.00176358538270623305, -0.00052276903670592017, -0.00006562621078234242, -0.00000032014955309023, 0.00006498590468442143, 0.00052212869422822413, 0.0017629450984361849, 0.00417927169821032639, 0.00816294422711046248, 0.01410580244834733557, 0.0223996785483259013, 0.03343641615298382358, 0.04760783728266125558, 0.06530579638442900181, 0.08692213291762368454, 0.11284866953387190369, 0.14347724729641292418, 0.17919967842972647776, 0.22040781766390726837, 0.26749356417103231642, 0.32084863377391231731, 0.38086493293661655146, 0.44793437635268479324, 0.52244863582074108077, 0.60479974505173317301, 0.69537932821382286708, 0.80157608643666866666, 0.96835922753294478849, 1.20400500297546386719, 1.43374387643531564507, 1.52711116148953740534, 1.42356063754573902713, 1.28131545600918927974, 1.15740766203535394574, 1.0489746577353638024, 0.95367443206251378829, 0.86957757237230826064, 0.79508468067209603358, 0.72886314286787634575, 0.66979618994074729965, 0.61694290665062911927, 0.56950739884753465159, 0.52681279404822844992, 0.48828145086185303914, 0.45341785567195341811, 0.42179586550248621135, 0.39304738236345099223, 0.3668531120331316453, 0.34293571393418686988, 0.32105307553425521672, 0.30099323164821822907, 0.28257034330021374435, 0.26562084331132168602, 0.25000020861625671387]
+time=[-1., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_InverseXDerivative_2_Check.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_InverseXDerivative_2_Check.txt
new file mode 100644
index 00000000..c0634390
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_InverseXDerivative_2_Check.txt
@@ -0,0 +1,15 @@
+last-generated=2015-08-11
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "number of continuous time states": "2",
+ "linear": " "
+}
+y=[-0.07407407462596893311, -0.07870240972812639346, -0.08372450136268196064, -0.08918311563954985088, -0.09512676945919408544, -0.10161053187423370325, -0.10869717415480523171, -0.11645840574905297338, -0.12497649805785068788, -0.13434598480973952705, -0.14467594279452233863, -0.15609262673625848294, -0.16874287393916048705, -0.18279785632277151253, -0.19845808454541788435, -0.21595937084975930231, -0.23558056538476193631, -0.25765255847287316104, -0.28257013476158776566, -0.31080726515545376021, -0.34293550543690176635, -0.37964898980810313223, -0.42179565707094474059, -0.47041911308391176627, -0.52681261552589964126, -0.59259259700775146484, -0.66979601158044554943, -0.76101415574062147851, -0.86957739420240520722, -0.99981198467370813177, -1.15740754377109578144, -1.34994299203404000131, -1.52711103027654959696, -1.32729207205971122541, -0.96835934860665917601, -0.74427831729326654475, -0.6048000433469522541, -0.48423680113537154179, -0.38086526101209500217, -0.29336323880417808363, -0.22040813076151591354, -0.16067753349148075626, -0.11284898997277961752, -0.07560000552096157733, -0.04760815771952173203, -0.02755101640956194101, -0.01410612377083670863, -0.00595101973779830432, -0.00176326547756210572, -0.00022040818632101562, -0.00000000000000000001, 0.00022040818632101562, 0.0017632654775621055, 0.00595101973779830432, 0.01410612377083679016, 0.02755101640956205897, 0.04760815771952189857, 0.07560000552096157733, 0.11284898997277929833, 0.16067753349148075626, 0.22040813076151591354, 0.29336323880417808363, 0.38086526101209500217, 0.48423680113537154179, 0.6048000433469522541, 0.74427831729326654475, 0.96835934860665917601, 1.3272920720597136679, 1.52711103027654959696, 1.34994299203404155563, 1.15740754377109822393, 0.99981198467370913097, 0.86957739420240431905, 0.76101415574062147851, 0.66979601158044621556, 0.59259259700775146484, 0.52681261552589919717, 0.47041911308391159974, 0.42179565707094490712, 0.37964898980810296569, 0.34293550543690126675, 0.31080726515545353816, 0.28257013476158776566, 0.25765255847287332758, 0.23558056538476193631, 0.21595937084975944109, 0.19845808454541788435, 0.18279785632277151253, 0.16874287393916048705, 0.15609262673625848294, 0.14467594279452228312, 0.13434598480973952705, 0.12497649805785061849, 0.11645840574905297338, 0.10869717415480528722, 0.10161053187423381428, 0.09512676945919408544, 0.08918311563954980925, 0.08372450136268196064, 0.07870240972812642122, 0.07407407462596893311]
+y_comp=[-0.07407407462596893311, -0.07870241717870699039, -0.08372451626377210021, -0.08918313054071104473, -0.09512679181093587621, -0.10161055422597549402, -0.1086972039571276194, -0.11645843555137536107, -0.12497653531074182087, -0.13434601461210929352, -0.14467598749800592017, -0.15609265653858087064, -0.16874291864264406859, -0.18279790102625509407, -0.19845812924890146589, -0.21595941555324288386, -0.23558062498935936069, -0.25765261807751793643, -0.28257022416844834733, -0.31080735456242092329, -0.34293559484386892944, -0.37964910901739268301, -0.42179577628010406221, -0.47041923229321319644, -0.52681273473518919204, -0.59259277582168579102, -0.6697961903943798756, -0.76101433455455580468, -0.86957763262098430879, -0.9998122826968846022, -1.15740778219014850414, -1.34994334966190865366, -1.52711150711328147445, -1.32729242968757987775, -0.96835982544381737913, -0.74427879413030628708, -0.60480052018398022806, -0.48423727797252974492, -0.38086576765157559299, -0.29336377524598106215, -0.22040869700564127975, -0.16067809973563276782, -0.1128495785686467745, -0.07560062391914297575, -0.04760879101887691145, -0.0275516720606581722, -0.0141067980483790649, -0.00595171497010275278, -0.00176398108254446516, -0.00022114412032940608, -0.00000075626689977072, 0.00021963160881248648, 0.0017624686146832894, 0.00595020250224157724, 0.01410528558051797089, 0.02755015959279711463, 0.04760727855101590245, 0.07559911145128180021, 0.11284806610078527978, 0.16067659471832554385, 0.22040717708719950729, 0.29336225532753928968, 0.38086424773313382053, 0.48423575805415902673, 0.6047990300678608433, 0.74427730401418690231, 0.96835827572305321898, 1.32729099917610771087, 1.52711007660180686507, 1.34994203835972514938, 1.15740659009678181768, 0.9998111502086822755, 0.86957655973711689423, 0.76101332127559462304, 0.66979523671977991839, 0.59259182214736938477, 0.52681184066551711709, 0.47041836802585190735, 0.42179494181507737327, 0.3796483043546880487, 0.34293481998360475504, 0.31080660950436100887, 0.28256950891281762406, 0.25765193262410318598, 0.2355799693383141824, 0.21595878970447288103, 0.19845751830129251814, 0.18279730497980734016, 0.16874235239851870238, 0.15609212009677789212, 0.14467545105620288615, 0.13434552287374251778, 0.12497605102301480307, 0.11645797361542573056, 0.10869676437280731407, 0.10161013699343256211, 0.09512639693017016507, 0.08918275801172259598, 0.08372416608648404479, 0.07870208935316075349, 0.07407377660274505615]
+time=[-1.5, 1.5]
+der_y=[-0.14814814925193786621, -0.16061717044960890921, -0.17442606210812833245, -0.18975130925967087503, -0.20679732874417164346, -0.22580118600214249547, -0.24703904487625460984, -0.27083349041507531751, -0.29756309691909232917, -0.32767312796063013947, -0.36168986419909315844, -0.40023747249299701512, -0.44406018441473538161, -0.49404826361642495414, -0.55127248112541260561, -0.61702675498186521086, -0.6928840364898641857, -0.78076532557481914676, -0.88303170775778405677, -1.00260415827805360323, -1.14311826236437719118, -1.30913451254013146752, -1.50641303654255365174, -1.74229302112022366167, -2.02620214861166658693, -2.37037038803100585938, -2.79081699846848740876, -3.30875726039069872897, -3.95262472535557396469, -4.7610095523714708321, -5.78703783903346735684, -7.10496295517975617884, -0.60537342208484234973, 11.7853801549795118575, 10.33036896893366396455, 5.15554752857655707032, 4.32000044334081856334, 3.72489813683934167798, 3.17387722751146172939, 2.66693857171629655767, 2.20408136192701276102, 1.78530595577049711054, 1.41061228937988958343, 1.08000011131692796873, 0.79346930740331067522, 0.55102034091962426299, 0.35265307254206040843, 0.19836732711355850589, 0.08816326823404911639, 0.0220408171077775758, 0.00000000000000000455, 0.0220408171077775758, 0.08816326823404911639, 0.19836732711355850589, 0.3526530725420617407, 0.5510203409196258173, 0.7934693074033125626, 1.08000011131692796873, 1.41061228937988691889, 1.78530595577049711054, 2.20408136192701276102, 2.66693857171629655767, 3.17387722751146172939, 3.72489813683934167798, 4.32000044334081856334, 5.15554752857655707032, 10.33036896893366396455, 11.78538015497946211951, -0.60537342208484234973, -7.10496295517976683698, -5.78703783903348423223, -4.76100955237147704935, -3.95262472535556819153, -3.30875726039069872897, -2.79081699846849096147, -2.37037038803100585938, -2.02620214861166436648, -1.74229302112022277349, -1.50641303654255453992, -1.30913451254013080138, -1.14311826236437497073, -1.00260415827805271505, -0.88303170775778405677, -0.78076532557481981289, -0.6928840364898641857, -0.61702675498186576597, -0.55127248112541260561, -0.49404826361642495414, -0.44406018441473538161, -0.40023747249299701512, -0.36168986419909293639, -0.32767312796063013947, -0.29756309691909210713, -0.27083349041507531751, -0.24703904487625477637, -0.22580118600214280078, -0.20679732874417164346, -0.18975130925967076401, -0.17442606210812833245, -0.16061717044960902023, -0.14814814925193786621]
+der_y_comp=[-0.14814814925193786621, -0.16061718535084115733, -0.17442610681175402254, -0.18975136886431565042, -0.20679740324997761269, -0.22580127540910965855, -0.24703913428322177293, -0.2708335798220424806, -0.29756318632601214125, -0.32767321736759730255, -0.36168995360606032152, -0.4002375618999641782, -0.44406027382170254469, -0.4940483530234631715, -0.55127260033470215639, -0.61702687419115476164, -0.69288415569915373649, -0.78076544478410869754, -0.88303188657171838294, -1.00260427748748526255, -1.14311850078295629274, -1.30913475095871056908, -1.50641339417042230409, -1.74229337874809231401, -2.02620262544825635587, -2.3703708648681640625, -2.79081747530564561188, -3.30875773722785693209, -3.95262544061235310267, -4.76101050604578723835, -5.78703879270967824766, -7.10496390885464101927, -0.60537431615472714341, 11.78537920130519545125, 10.3303680152593475583, 5.15554705173845118082, 4.31999948966754487856, 3.72489766000161504067, 3.1738765122557244247, 2.66693785646055925298, 2.2040808850893807147, 1.78530535972383619381, 1.41061169333344182952, 1.07999939606132100423, 0.79346865175221814592, 0.5510196852684725588, 0.35265241689096787914, 0.19836665656129590096, 0.08816259768179372791, 0.02204014283023355419, -0.00000067486689658369, 0.02204014283023355419, 0.08816259768179372791, 0.19836665656129590096, 0.3526524168909692114, 0.55101968526847411312, 0.7934686517522200333, 1.07999939606132100423, 1.41061169333343916499, 1.78530535972383619381, 2.2040808850893807147, 2.66693785646055925298, 3.1738765122557244247, 3.72489766000161504067, 4.31999948966754487856, 5.1555470517393988672, 10.33036896893366396455, 11.78538015497946211951, -0.60537228959637845449, -7.10496200150601886492, -5.78703736219632602911, -4.76100859869753989528, -3.95262401010087316422, -3.30875630671647735781, -2.79081628321275365678, -2.37036967277526855469, -2.0262014333559270618, -1.7422923058644854688, -1.50641232128681723523, -1.3091337972843934967, -1.14311766631745359568, -1.00260344302231541036, -0.88303105210669152747, -0.7807646699237272836, -0.69288338083877165641, -0.61702609933077323667, -0.55127182547432007631, -0.49404763776772586681, -0.44405955856596524001, -0.40023684664422687352, -0.36168923835032279479, -0.32767253191408762802, -0.29756247107032196553, -0.27083286456630517591, -0.2470384339285155717, -0.22580057505459305567, -0.20679671779657451958, -0.1897506983121446944, -0.17442546606168057854, -0.16061657440316126633, -0.1481475532054901123]
+err=[0., 0.00000000625248541388, 0.00000001247310866373, 0.00000001612290117623, 0.00000002047694557998, 0.00000002460112666368, 0.00000002717015626323, 0.0000000298823407803, 0.00000003247109160838, 0.0000000351060636313, 0.00000003781725257596, 0.0000000405418164682, 0.00000004335076525503, 0.00000004625753778856, 0.00000004923192992222, 0.00000005242267930828, 0.0000000558533178306, 0.00000006242874186512, 0.00000007086408943298, 0.00000007949704388137, 0.00000008993870609789, 0.0000001011964574087, 0.00000011345866374889, 0.00000012810720408058, 0.00000014176434469981, 0.00000015872797121119, 0.00000017381387584413, 0.00000019140685327575, 0.00000021388944648475, 0.00000024566491562221, 0.0000002818987122454, 0.00000032869708577364, 0.00000037408414870356, 0.00000040448349237405, 0.00000042813316906676, 0.0000004485670991971, 0.00000047404065050904, 0.00000049336153067652, 0.00000051303454531085, 0.00000053298198012145, 0.00000055305958664634, 0.00000057331357808189, 0.00000059359211582775, 0.00000061390391703597, 0.00000063422851811353, 0.00000065457630120903, 0.00000067492839934801, 0.0000006952749937826, 0.00000071560611923005, 0.00000073594338755384, 0.00000075626689977071, 0.00000077657125575447, 0.00000079685099853664, 0.000000817129202769, 0.00000083742429705586, 0.00000085771955179221, 0.00000087801651687098, 0.00000089831667526473, 0.00000091862142789318, 0.00000093893219583369, 0.00000095925064772124, 0.0000009795779671812, 0.00000099988607358926, 0.00000102017169013693, 0.00000104044716839627, 0.00000103897599600089, 0.00000107389257422757, 0.00000105643344955099, 0.0000010061552643026, 0.00000094347790976204, 0.00000091927042953338, 0.00000089160658529687, 0.00000086614183962053, 0.00000084205373509948, 0.00000081884157825271, 0.00000079619690041, 0.00000077392693521301, 0.00000075190792078065, 0.00000073005728978513, 0.00000070679050557218, 0.00000068393789489842, 0.00000066221037342014, 0.00000064131948777593, 0.00000062103595793621, 0.00000060119258369137, 0.00000058167299013017, 0.00000056239448909957, 0.00000054329701467477, 0.00000052433664686871, 0.00000050548087112548, 0.00000048670548971818, 0.0000004679922488425, 0.00000044932704075131, 0.00000043069917866487, 0.00000041132535067048, 0.00000039238263188603, 0.00000037369588016542, 0.0000003551915392279, 0.00000033683566112087, 0.0000003186277299216, 0.00000030055787192396]
+der_err=[0., 0.00000002516206172602, 0.00000004970140615854, 0.00000006075880080857, 0.00000007408309448473, 0.00000008410399512659, 0.00000008482651058977, 0.00000008619758838671, 0.00000008694730938052, 0.0000000880835032515, 0.00000008957497941991, 0.00000009148177605104, 0.0000000938060289408, 0.00000009719504948607, 0.00000010107843003994, 0.00000010701902014968, 0.00000011391339065701, 0.00000013866459829087, 0.00000017354067789839, 0.00000020162985098306, 0.00000023975609041222, 0.00000027508361204339, 0.00000031300668458496, 0.00000036324056128259, 0.00000039458291501494, 0.00000045068043164065, 0.00000047513008199921, 0.00000052296666736073, 0.00000060569067504756, 0.00000076317624455513, 0.00000092088339090738, 0.00000116225913142677, 0.0000009102084474983, 0.00000075828209149141, 0.00000068238320773038, 0.00000064753357734575, 0.00000067487718523524, 0.00000067486917032714, 0.00000067486467969448, 0.00000067486246280044, 0.00000067486126909, 0.00000067486132593341, 0.00000067486161015035, 0.00000067486212174105, 0.00000067486274701898, 0.00000067486354282681, 0.00000067486433863443, 0.00000067486507759902, 0.00000067486564603311, 0.00000067486632815415, 0.00000067486689658836, 0.00000067486729449229, 0.00000067486752186598, 0.00000067486780608299, 0.0000006748681471436, 0.00000067486848820403, 0.00000067486882926453, 0.00000067486922716859, 0.00000067486962507256, 0.00000067487007981961, 0.00000067487059141036, 0.00000067487115984452, 0.00000067487155774857, 0.00000067487184196593, 0.00000067487206933947, 0.00000040625541524543, 0.00000006406269804977, -0.00000042106583653166, -0.0000011552641255472, -0.00000082803974932835, -0.00000084271618927617, -0.0000007965380124584, -0.00000076795722561424, -0.0000007499769471093, -0.00000073843501518886, -0.000000730883414235, -0.0000007258561215968, -0.00000072245023851068, -0.00000072007821750694, -0.00000070049157436417, -0.0000006780443149697, -0.00000066179706330099, -0.00000065013920715646, -0.00000064169944614219, -0.00000063550248490153, -0.00000063090276964855, -0.00000062745840935898, -0.00000062485804722792, -0.00000062287938287391, -0.00000062136262881308, -0.00000062019177149943, -0.00000061928199150883, -0.00000061856763955233, -0.00000061800119304232, -0.00000061163633504559, -0.00000060696123915319, -0.0000006034852043566, -0.00000060054520351446, -0.00000059815511641055, -0.00000059632293537543, -0.0000005950699346613]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_InverseXRegularized.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_InverseXRegularized.txt
deleted file mode 100644
index d9610bb5..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_InverseXRegularized.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-last-generated=2015-08-11
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-y=[-1., -1.020408154001308354, -1.04166662790444397579, -1.06382978114919790613, -1.08695650312895564227, -1.11111116226150508091, -1.13636362900588427927, -1.16279065528761416104, -1.19047618421558754065, -1.21951221361174355629, -1.24999999536656014598, -1.28205132681383870974, -1.31578947047237693191, -1.35135139785821678515, -1.3888888336201408169, -1.42857143844084721884, -1.47058822280466161558, -1.51515149254140868429, -1.56249996529247359156, -1.61290324982803978671, -1.66666661048315978277, -1.72413794151115817854, -1.78571427634167756437, -1.85185179253943577038, -1.92307690804246500527, -2., -2.07698351437544337372, -2.12829109191539256329, -2.13506102722149337936, -2.09052246527464413717, -1.99744011230591267392, -1.86555830102351327682, -1.70904505425236763472, -1.54393682620716088394, -1.38558035579211780153, -1.24607996656964736815, -1.13173952684040246552, -1.04050628386156462923, -0.95999994039549729763, -0.87999988079113666828, -0.80000005960446696207, -0.7200000000000001954, -0.63999988079110137207, -0.56000005960443166586, -0.47999997019771312168, -0.39999991059321038378, -0.32000005960452027054, -0.23999998509886566467, -0.15999991059319285114, -0.08000007450566393175, 0., 0.08000007450452709112, 0.16000014900905418225, 0.24000022351379440844, 0.31999982118894360061, 0.39999991059463191334, 0.47999997019742934867, 0.56000005960357857049, 0.64000011920729971138, 0.72000023841467097885, 0.79999982118890766714, 0.87999988079284197084, 0.95999994039606573182, 1.04050628386096621902, 1.13173952683818423992, 1.24608035069040634646, 1.38557991170435590433, 1.54393633767621030195, 1.70904505425411912256, 1.86555830102402486759, 1.99744011230394802325, 2.09052266712640610891, 2.13506095738127443795, 2.12829118053065080574, 2.07698351437451167456, 2., 1.92307679805917608462, 1.8518516910902842465, 1.78571408751781457447, 1.72413803071681526191, 1.66666669360146446621, 1.61290324982822563804, 1.56249996529299095549, 1.5151514245384125612, 1.47058809447640248536, 1.42857156050256750568, 1.38888889140426230462, 1.35135139785795588274, 1.31578944471152059492, 1.28205127805932361795, 1.2499999258660678958, 1.21951230258555121111, 1.19047622665373431516, 1.16279067552180270795, 1.13636361939678143251, 1.11111113478931011755, 1.08695645052415756915, 1.06382984465896202053, 1.04166666849571476483, 1.02040817347483780964, 1.]
-xInv=[-1., -1.020408154001308354, -1.04166662790444397579, -1.06382978114919790613, -1.08695650312895564227, -1.11111116226150508091, -1.13636362900588427927, -1.16279065528761416104, -1.19047618421558754065, -1.21951221361174355629, -1.24999999536656014598, -1.28205132681383870974, -1.31578947047237693191, -1.35135139785821678515, -1.3888888336201408169, -1.42857143844084721884, -1.47058822280466161558, -1.51515149254140868429, -1.56249996529247359156, -1.61290324982803978671, -1.66666661048315978277, -1.72413794151115817854, -1.78571427634167756437, -1.85185179253943577038, -1.92307690804246500527, -2., -2.08333333734054937381, -2.17391290148166183016, -2.27272723884888350199, -2.38095245376647390856, -2.49999985246462630428, -2.63157888959393426731, -2.77777778343346559708, -2.94117619025939802668, -3.1249999310134040087, -3.3333333881051716574, -3.57142817758306252429, -3.84615359717639382353, -4.16666667609536034433, -4.5454551041717961013, -4.99999970782115710222, -5.55555556940270900412, -6.25000105072061362677, -7.14285636516088295878, -8.33333335799669505661, -9.99994039547596180739, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 8.33333335800179142439, 7.14285636517146205193, 6.24999872797041344796, 5.55555375995786793197, 5.00000121640015215974, 4.54545510416282461108, 4.1666666760928512403, 3.84615359717846416743, 3.57142817758842356923, 3.33333273102355676087, 3.12500051870276385202, 2.94117670666565667048, 2.77777778343180159482, 2.63157888959344798963, 2.49999985246682543405, 2.3809521172599814598, 2.27272754931886877827, 2.17391318387136855961, 2.08333333733930547993, 2., 1.92307679805917608462, 1.8518516910902842465, 1.78571408751781457447, 1.72413803071681526191, 1.66666669360146446621, 1.61290324982822563804, 1.56249996529299095549, 1.5151514245384125612, 1.47058809447640248536, 1.42857156050256750568, 1.38888889140426230462, 1.35135139785795588274, 1.31578944471152059492, 1.28205127805932361795, 1.2499999258660678958, 1.21951230258555121111, 1.19047622665373431516, 1.16279067552180270795, 1.13636361939678143251, 1.11111113478931011755, 1.08695645052415756915, 1.06382984465896202053, 1.04166666849571476483, 1.02040817347483780964, 1.]
-time=[0., 1.]
-dy_dt=[-2., -2.08246565056268684302, -2.17013883997460821362, -2.26346755677778332938, -2.36294890374645527586, -2.4691357531389512836, -2.5826447168556656564, -2.70416450128244978401, -2.83446719693150628316, -2.97442001913579678885, -3.12499997689053277128, -3.28731108724384402109, -3.46260385671926895768, -3.6523009295624784265, -3.85802458449837804011, -4.08163247629925685089, -4.32525977731516686475, -4.59136814908605206398, -4.88281228375101949979, -5.20291384195019901426, -5.55555523434383680126, -5.94530371172966809468, -6.37755113368825998776, -6.85871055619440905815, -7.39644987465743408706, -8., -6.84246736963244561736, -3.10897109765537704718, 1.863576985570854605, 6.99382184424040787007, 11.45599551235043378483, 14.6799605763511848977, 16.35113002613788779627, 16.41052319071001974748, 15.05474632920519084678, 12.73599850679144651622, 10.16207665899460366177, 8.29634633459828485513, 8., 8., 8., 8., 8., 8., 8., 8., 8., 8., 8., 8., 8., 8., 8., 8., 8., 8., 8., 8., 8., 8., 8., 8., 8., 8.29634633458898917979, 10.16207665894209810631, 12.73600614648625395375, 15.05474035452404457658, 16.41052105295440100008, 16.3511300261305194681, 14.67996057634183948437, 11.45599551242221458836, 6.99380712750964850244, 1.86359253195626317634, -3.10895744654382211181, -6.84246736967415891684, -8., -7.39644902949474580822, -6.85870980747935021782, -6.37754978934344585184, -5.94530432907022454714, -5.55555578959110629711, -5.20291384195140071967, -4.88281228375424358745, -4.59136773818687871085, -4.32525902410264873055, -4.08163317500594668985, -3.85802490634602746056, -3.65230092956106444646, -3.46260372123240767195, -3.28731083780833488461, -3.12499963025402971439, -2.97442045396501519861, -2.83446739950167225786, -2.70416459559584199113, -2.58264467320468105171, -2.46913563131060476152, -2.36294867548475773233, -2.26346782760978237903, -2.17013900945609750082, -2.08246573020981662339, -2.]
-d2y_dt2=[-8., -8.49985982160295883148, -9.04224493666978546003, -9.63177685127091720574, -10.27369123779768145255, -10.97393698057975974791, -11.73929416045015372561, -12.57750890048133385335, -13.49746244669454497966, -14.50936565945661449462, -15.6249998271089616253, -16.85800560177467488643, -18.22423210997090237129, -19.74216729077423337912, -21.43346966705029288391, -23.32361484972614107392, -25.44270405946116753171, -27.82647278917113453645, -30.51757610395452502416, -33.56718523282984278922, -37.03703580652057070211, -41.00209327391026903342, -45.55393659488362345655, -50.80526119846938826186, -56.89577078846857460803, -64., 268.96406649600260152511, 455.45456810954482307352, 521.0316744630820267048, 491.25369045586649008328, 391.68013734553625226908, 247.86948284406162201776, 85.38100258207194315219, -70.22572923650609766355, -193.39260194676461424024, -258.56000895599441946615, -240.16904346716125928651, -112.66056122269557704385, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 112.66056122143588424933, 240.16904346592602337296, 258.55991212647313659545, 193.39288163310513368742, 70.22615566475860759965, -85.38100258380421792026, -247.86948284461274738533, -391.68013734337984033118, -491.25388623767162243894, -521.03168947560732249258, -455.45492143859564748709, -268.96406649257801291242, 64., 56.89576104633556496992, 50.8052529099927170364, 45.55392223797772288663, 41.00209968242891278578, 37.03704137036739041378, 33.56718523284151700636, 30.51757610398465558887, 27.8264690649595145544, 25.44269742816032575661, 23.32362084911826016764, 21.43347235601951439321, 19.74216729076273679766, 18.22423104108532854184, 16.85800368752477140788, 15.62499723378458149625, 14.50936884711215135724, 13.49746389709117622147, 12.57750955990077734725, 11.73929386301149691008, 10.97393617018664535578, 10.27368975209017598615, 9.63177858368179329318, 9.042245998148946029, 8.49986031023917121274, 8.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_IsMonotonic.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_IsMonotonic.txt
deleted file mode 100644
index f37121bc..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_IsMonotonic.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-x_incWeak[3]=[1., 1.]
-x_notWeak[2]=[3., 3.]
-x_incWeak[4]=[2., 2.]
-x_decWeak[4]=[0.5, 0.5]
-x_notMon[2]=[3., 3.]
-x_incWeak[2]=[1., 1.]
-x_decStrict[2]=[2., 2.]
-x_notWeak[4]=[2., 2.]
-x_incStrict[2]=[1., 1.]
-x_decWeak[2]=[1., 1.]
-x_notMon[3]=[2., 2.]
-x_notWeak[3]=[3., 3.]
-x_notMon[1]=[0., 0.]
-x_notWeak[1]=[0., 0.]
-x_incWeak[1]=[0., 0.]
-x_decStrict[3]=[0.10000000149011611938, 0.10000000149011611938]
-x_decStrict[1]=[2.5, 2.5]
-x_decWeak[1]=[3., 3.]
-time=[0., 1.]
-x_incStrict[3]=[2., 2.]
-x_decWeak[3]=[1., 1.]
-x_incStrict[1]=[0., 0.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_Polynomial.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_Polynomial.txt
new file mode 100644
index 00000000..1fa2b656
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_Polynomial.txt
@@ -0,0 +1,9 @@
+last-generated=2016-12-14
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+x=[-62., -61.9948806758530110983, -61.9590492218248982681, -61.86186217273198906241, -61.67288968646983704502, -61.36217501509769789436, -60.90056602536135699211, -60.26017000431799175431, -59.4148901142679193299, -58.34102291005826401715, -57.01795217798566994816, -55.42890538248819609635, -53.56171744054458372375, -51.40965923129303405403, -48.9722329706275161243, -46.25591827931680199981, -43.27487070652022538297, -40.05149900558187425759, -36.6168466879647951373, -33.01076419632223490908, -29.28180806787053924722, -25.48673189411187323117, -21.6895861902182787162, -17.9602256890055471672, -14.37221340937221825129, -11., -7.91516458201442585363, -5.18174638930408093529, -2.8503377630210713356, -0.95098722501705146293, 0.51544422003343393079, 1.58754874902995868347, 2.35543917220596199513, 2.97490469025891357546, 3.68381423309855682291, 4.82101105754789216462, 6.84796736151590312858, 10.37348732982906440725, 16.18164806060661575771, 25.26340231663030166942, 38.85202995952516857869, 58.4630594265766418971, 85.93840556968382315972, 123.49569736072518821857, 173.78346139436010275858, 239.94093376705032483187, 325.66483810130375786684, 435.2838285095150467896, 573.83726712053339724662, 747.16394349689744558418, 962., 1226.08097211070821686008, 1548.25764723073075401771, 1938.62002233608541246213, 2408.62782293616783135803, 2971.26856819145132249105, 3641.19709475712579660467, 4434.91664214768206875306, 5370.95777425122560089221, 6470.07591917478839604883, 7755.45328647986661962932, 9252.95866440126155794133, 10991.34091848038588068448, 13002.52155211476565455087, 15321.863957954992656596, 17988.46978930348268477246, 21045.47201291490637231618, 24540.45283888859194121324, 28525.69231224158284021541, 33058.61444682449655374512, 38202.17457250686857150868, 44025.30640835938538657501, 50603.30838651093654334545, 58018.50861571485438616946, 66360.53073175568715669215, 75727., 86224.05758007377153262496, 97966.96923888953460846096, 111080.78222683843341656029, 125700.88132493299781344831, 141974.05789375660242512822, 160058.74550590102444402874, 180126.12463617557659745216, 202360.89879680739250034094, 226962.08411049016285687685, 254143.87010412002564407885, 284137.11165321856969967484, 317189.4211264341720379889, 353566.92460620624478906393, 393555.02924150653416290879, 437459.76686689775669947267, 485608.55655762943206354976, 538352.72126061713788658381, 596067.01973088982049375772, 659152.32835354912094771862, 728036.52399865863844752312, 803176.16973670071456581354, 885057.69517277576960623264, 974200.63668894337024539709, 1071156.90442437771707773209, 1176514.]
+time=[0., 4.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_PowerLinearized.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_PowerLinearized.txt
deleted file mode 100644
index 9749d2cc..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_PowerLinearized.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1', 'linear': ' '}
-TExact=[319.563812255859375, 317.33813471524354099529, 315.06463612750258107553, 312.74081405105647490927, 310.36401345642030946692, 307.93130511461953346952, 305.43954433861114239335, 302.88528450072146824823, 300.26467847904046948315, 297.57363988888192807281, 294.80752605158619417125, 291.96127302070124187594, 289.02926555647701434282, 286.00521703611889279273, 282.88208026675380324377, 279.65194897352887437592, 276.30581542726827137813, 272.83352724171578529422, 269.2233302606420011216, 265.46179107210815573126, 261.53317379940318687659, 257.41906460638546150221, 253.09771675385781009027, 248.54290965721580164427, 243.72297400478143458713, 238.5988006591796875, 233.12145451038315968617, 227.22830852230751474963, 220.83728106191321671758, 213.83762502721020837271, 206.07409109708390815285, 197.31830053943403413541, 187.2120128973708688136, 175.13911627747597776761, 159.87817992065390626522, 138.30172530563368127332, 94.08172615916092240695, 120.26004865963233214643, 149.28554760216684371699, 167.34180297910680224049, 180.93293023876182701315, 192.00877737878181505948, 201.4440726614271852668, 209.71361740951084584594, 217.10656904140006417947, 223.81319422340231994895, 229.96593741246132935885, 235.66107242750379668905, 240.97089170677080005589, 245.99999523163808134996, 251., 256.00000476829086437647, 261.00000953658172875294, 266.0000143048725931294, 270.99998927134555515295, 275.99999403963641952942, 280.9999988078917567691, 286.00000357621814828235, 291.00000834450901265882, 296.00001311279987703529, 300.99998807927283905883, 305.9999928475637034353, 310.99999761585456781177, 316.00000238414543218823, 321.0000071524362965647, 326.00001192072716094117, 330.99998688720012296471, 335.99999165549098734118, 340.99999642378185171765, 346.0000011921082432309, 351.00000596036358047058, 356.00001072865444484705, 360.9999856951274068706, 365.99999046341827124706, 370.99999523170913562353, 376., 381.00000476829086437647, 386.00000953658172875294, 391.0000143048725931294, 395.99998927134555515295, 400.99999403963641952942, 405.9999988078917567691, 411.00000357621814828235, 416.00000834450901265882, 421.00001311279987703529, 425.99998807927283905883, 430.9999928475637034353, 435.99999761585456781177, 441.00000238414543218823, 446.0000071524362965647, 451.00001192072716094117, 455.99998688720012296471, 460.99999165549098734118, 465.99999642378185171765, 471.0000011921082432309, 476.00000596036358047058, 481.00001072865444484705, 485.9999856951274068706, 490.99999046341827124706, 495.99999523170913562353, 501.]
-T=[1., 6.00000011175869030211, 11.00000022351738060422, 16.00000033527575737935, 21.00000044703476120844, 25.99999962747103410265, 31.00000067055214358902, 35.99999985098813937157, 41.00000089406785974688, 45.99999821186428050623, 50.99999925494345376364, 56.00000029802261991563, 61.00000134110178606761, 66.00000238418095932502, 70.9999997019773871898, 75.99999701977380084372, 81.00000178813571949377, 85.99999910593214735854, 90.99999642372856101247, 96.00000119209047966251, 100.99999850988690752729, 106.00000327824881196648, 111.00000059604523983126, 115.99999791384166769603, 121.00000268220357213522, 126., 131.00000476836191865004, 135.99999463559285572956, 140.9999994039547743796, 146.00000417231666460793, 150.99999403954760168745, 155.99999880790952033749, 161.00000357627143898753, 165.99999344350237606704, 170.99999821186429471709, 176.00000298022618494542, 180.99999284745712202493, 185.99999761581904067498, 191.00000238418095932502, 196.00000715254287797507, 200.99999701977381505458, 206.00000178813570528291, 211.00000655649762393296, 215.99999642372856101247, 221.00000119209047966251, 226.00000596045239831255, 230.99999582768333539207, 236.0000005960452256204, 241.00000536440714427044, 245.99999523163808134996, 251., 256.00000476829086437647, 261.00000953658172875294, 266.0000143048725931294, 270.99998927134555515295, 275.99999403963641952942, 280.9999988078917567691, 286.00000357621814828235, 291.00000834450901265882, 296.00001311279987703529, 300.99998807927283905883, 305.9999928475637034353, 310.99999761585456781177, 316.00000238414543218823, 321.0000071524362965647, 326.00001192072716094117, 330.99998688720012296471, 335.99999165549098734118, 340.99999642378185171765, 346.0000011921082432309, 351.00000596036358047058, 356.00001072865444484705, 360.9999856951274068706, 365.99999046341827124706, 370.99999523170913562353, 376., 381.00000476829086437647, 386.00000953658172875294, 391.0000143048725931294, 395.99998927134555515295, 400.99999403963641952942, 405.9999988078917567691, 411.00000357621814828235, 416.00000834450901265882, 421.00001311279987703529, 425.99998807927283905883, 430.9999928475637034353, 435.99999761585456781177, 441.00000238414543218823, 446.0000071524362965647, 451.00001192072716094117, 455.99998688720012296471, 460.99999165549098734118, 465.99999642378185171765, 471.0000011921082432309, 476.00000596036358047058, 481.00001072865444484705, 485.9999856951274068706, 490.99999046341827124706, 495.99999523170913562353, 501.]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_QuinticHermite.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_QuinticHermite.txt
new file mode 100644
index 00000000..909d4400
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_QuinticHermite.txt
@@ -0,0 +1,11 @@
+last-generated=2017-04-19
+statistics-simulation=
+{
+ "numerical Jacobians": "0",
+ "nonlinear": " ",
+ "linear": " "
+}
+y=[-0e+00, -3e-02, -6e-02, -9e-02, -1.2e-01, -1.5e-01, -1.8e-01, -2.1e-01, -2.4e-01, -2.7e-01, -3e-01, -3.3e-01, -3.6e-01, -3.9e-01, -4.2e-01, -4.5e-01, -4.8e-01, -5.1e-01, -5.4e-01, -5.700000000000001e-01, -6.000000000000001e-01, -6.3e-01, -6.6e-01, -6.900000000000001e-01, -7.2e-01, -7.5e-01, -7.8e-01, -8.100000000000001e-01, -8.400000000000001e-01, -8.699999999999999e-01, -8.999999999999999e-01, -9.299999999999999e-01, -9.6e-01, -9.9e-01, -1.019912261632064e+00, -1.048665566997858e+00, -1.074680412433243e+00, -1.096546878863487e+00, -1.113027459508729e+00, -1.123050936319145e+00, -1.125705242930048e+00, -1.120230203555175e+00, -1.106010669171881e+00, -1.082569800520667e+00, -1.049561684269088e+00, -1.006764210658394e+00, -9.54072585322894e-01, -8.914918733721252e-01, -8.191306852928684e-01, -7.371926528966211e-01, -6.459712386131287e-01, -5.458417722877216e-01, -4.372544509151122e-01, -3.207281370110097e-01, -1.968411855588962e-01, -6.622737399478147e-02, 7.04329747488228e-02, 2.124189394319756e-01, 3.589783435815516e-01, 5.093312635600241e-01, 6.626794414334378e-01, 8.182119280669724e-01, 9.751146877985784e-01, 1.132573798864472e+00, 1.2897850132646e+00, 1.445959439955408e+00, 1.600333235439848e+00, 1.752170491219705e+00, 1.900773234517815e+00, 2.045487243260429e+00, 2.18570943603661e+00, 2.320893733788491e+00, 2.450562589576114e+00, 2.574306733534539e+00, 2.691797385288138e+00, 2.802791833877563e+00, 2.907140112237371e+00, 3.00479286890061e+00, 3.095807324684377e+00, 3.180354903355356e+00, 3.2587277857647e+00, 3.33134754718719e+00, 3.398769533794293e+00, 3.461691360056026e+00, 3.520960129103713e+00, 3.577578394454489e+00, 3.63271250360315e+00, 3.687689259651212e+00, 3.743421120094512e+00, 3.799995754461433e+00, 3.857425359448786e+00, 3.915723048115936e+00, 3.974901695160137e+00, 4.03497465211883e+00, 4.095955508777127e+00, 4.157858093453923e+00, 4.220695731291793e+00, 4.284483249178185e+00, 4.349234933585608e+00, 4.414965566515988e+00, 4.481688976287842e+00]
+time=[0e+00, 3e+00]
+dy=[-1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -9.869175867428794e-01, -9.211307418679889e-01, -8.053704633520825e-01, -6.45521486334626e-01, -4.472361951158819e-01, -2.159334289180663e-01, 4.320054576115617e-02, 3.25215959936051e-01, 6.253934889088695e-01, 9.392481941126364e-01, 1.262527253352184e+00, 1.591215348304821e+00, 1.921526484441694e+00, 2.24990952495095e+00, 2.573045596545123e+00, 2.887853087642978e+00, 3.191479682922363e+00, 3.481308250883506e+00, 3.754954601228877e+00, 4.010267459153466e+00, 4.24533220505057e+00, 4.458463350384848e+00, 4.648211785437506e+00, 4.813359063400199e+00, 4.952924687342281e+00, 5.066156925953866e+00, 5.152539841537396e+00, 5.211790492482153e+00, 5.243859757793487e+00, 5.248931402700046e+00, 5.227422661031741e+00, 5.179985137960826e+00, 5.107502035935126e+00, 5.011092150945177e+00, 4.892106365389393e+00, 4.752128740141051e+00, 4.592978414624806e+00, 4.416707735392851e+00, 4.225598897329907e+00, 4.022171893518093e+00, 3.809178796880512e+00, 3.589604616165161e+00, 3.366668249651081e+00, 3.143821771261395e+00, 2.924751143170154e+00, 2.713375263403587e+00, 2.513848443835827e+00, 2.330553445803154e+00, 2.168111280379742e+00, 2.031374971150955e+00, 1.925430601343654e+00, 1.855598257793623e+00, 1.827431200300767e+00, 1.843844629825606e+00, 1.871710560047256e+00, 1.899997877230716e+00, 1.928712679724393e+00, 1.957861524057968e+00, 1.987450847580069e+00, 2.017487326059415e+00, 2.047977754388564e+00, 2.078929046726961e+00, 2.110347865645897e+00, 2.142241624589093e+00, 2.174617466792804e+00, 2.207482783257994e+00, 2.240844488143921e+00]
+ddy=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.292652947659961e+00, 3.059137336699797e+00, 4.625538604404823e+00, 5.999650812601891e+00, 7.18924907794261e+00, 8.202114453662475e+00, 9.046025946620997e+00, 9.728770815444506e+00, 1.025812830630844e+01, 1.064187946294721e+01, 1.088780369452487e+01, 1.100368685266849e+01, 1.099730681160168e+01, 1.087644747052863e+01, 1.064889005349511e+01, 1.032241379182081e+01, 9.904801368713379e+00, 9.403835728117897e+00, 8.827296031086981e+00, 8.1829688846308e+00, 7.478628750875889e+00, 6.722060056944617e+00, 5.921044815893456e+00, 5.083367952310271e+00, 4.216803829269974e+00, 3.329137470310844e+00, 2.428150406600396e+00, 1.521627650547507e+00, 6.173437364159426e-01, -2.769163893770869e-01, -1.153371137152942e+00, -2.004235603398576e+00, -2.821735348842068e+00, -3.598084926042485e+00, -4.325503278897676e+00, -4.996208169538926e+00, -5.602419262202181e+00, -6.136349666013081e+00, -6.590227832835119e+00, -6.956266252456612e+00, -7.226684827517317e+00, -7.39370059967041e+00, -7.449533448884362e+00, -7.386400913360396e+00, -7.196521465256343e+00, -6.872114053558091e+00, -6.405400993042786e+00, -5.788593848846221e+00, -5.013913745489048e+00, -4.07357963195034e+00, -2.959809957347537e+00, -1.664822606833694e+00, -1.808364659173551e-01, 9.219223149128031e-01, 9.358552800236281e-01, 9.499989386153582e-01, 9.643563398621965e-01, 9.78930762028984e-01, 9.937254237900344e-01, 1.008743663029708e+00, 1.023988877194282e+00, 1.039464523363481e+00, 1.055173932822948e+00, 1.071120812294546e+00, 1.087308733396402e+00, 1.103741391628997e+00, 1.12042224407196e+00]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_RegNonZeroPower.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_RegNonZeroPower.txt
deleted file mode 100644
index 37462563..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_RegNonZeroPower.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-y=[1., 0.99395751371930640694, 0.98782808249998843575, 0.98160862997246867145, 0.9752957767734963257, 0.96888614469672384999, 0.96237605966356598586, 0.95576148747516753712, 0.94903839521914412636, 0.94220227249236143674, 0.9352484303555016476, 0.92817182368313733143, 0.92096704590675682045, 0.91362821701924457063, 0.90614925732722240159, 0.89852345447915871191, 0.8907435508218369824, 0.88280170101322852361, 0.87468964446724106754, 0.86639815368565520348, 0.85791717934710420845, 0.84923601881833776783, 0.84034263980076184808, 0.83122407396569875093, 0.82186598487639217492, 0.81225240230560302734, 0.80238205728796763161, 0.79231643253289407713, 0.78213036182127138041, 0.77189541534271266521, 0.76167994434392738423, 0.75154918672604731356, 0.7415652204492461097, 0.73178690499722864882, 0.72226989605413671747, 0.71306663215569821013, 0.70422649332274034339, 0.69579559958301384626, 0.68781686038051081944, 0.68033009810930433758, 0.67337185045685843399, 0.66697555564210819767, 0.66117143730411043201, 0.65598654732696259906, 0.6514446741121487916, 0.64756661627650480284, 0.64436978127842792219, 0.6418684722481849958, 0.64007389552189941639, 0.63899397851807870907, 0.63863343000411987305, 0.63899397851807870907, 0.64007389552189941639, 0.6418684722481849958, 0.64436978127842792219, 0.64756661627650491386, 0.6514446741121487916, 0.65598654732696259906, 0.66117143730411043201, 0.66697555564210808665, 0.67337185045685843399, 0.68033009810930433758, 0.68781686038051081944, 0.69579559958301384626, 0.70422649332274034339, 0.71306663215569821013, 0.72226989605413682849, 0.73178690499722875984, 0.7415652204492461097, 0.75154918672604731356, 0.76167994434392738423, 0.77189541534271255419, 0.78213036182127138041, 0.79231643253289407713, 0.80238205728796763161, 0.81225240230560302734, 0.82186598487639217492, 0.83122407396569875093, 0.84034263980076184808, 0.84923601881833776783, 0.85791717934710420845, 0.86639815368565520348, 0.87468964446724106754, 0.88280170101322852361, 0.8907435508218369824, 0.89852345447915871191, 0.90614925732722240159, 0.91362821701924457063, 0.92096704590675682045, 0.92817182368313733143, 0.9352484303555016476, 0.94220227249236143674, 0.94903839521914412636, 0.95576148747516753712, 0.96237605966356587484, 0.96888614469672373897, 0.9752957767734963257, 0.98160862997246867145, 0.98782808249998843575, 0.99395751371930640694, 1.]
-time=[-1., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_RegNonZeroPowerDerivativeCheck.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_RegNonZeroPowerDerivativeCheck.txt
deleted file mode 100644
index 21a548b1..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_RegNonZeroPowerDerivativeCheck.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-last-generated=2015-08-18
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "1",
- "linear": " "
-}
-y=[1., 0.98019800681638991069, 0.96039195993780834826, 0.94058180091519938415, 0.92076740995417849511, 0.90094872691701699541, 0.88112563367480345455, 0.86129801047077625409, 0.84146585681128682754, 0.82162887567476150519, 0.80178712615684855081, 0.78194042899408988667, 0.7620885466832966193, 0.74223147875774986293, 0.72236904640351506934, 0.70250113002679348551, 0.6826275515995449128, 0.66274801269630800871, 0.64286257258983381391, 0.62297087433447984051, 0.60307273876398970192, 0.58316798679271830697, 0.56325638056803262188, 0.54333762177133659854, 0.52341153138072071815, 0.50347769260406494141, 0.48353595611483651817, 0.46358888512696239115, 0.44413483368634382176, 0.42636452233066246542, 0.41093885484282344223, 0.39805707618455837826, 0.38763823458911761399, 0.37944608801801288367, 0.37317240437922855056, 0.36849045522988288504, 0.3650873301766622836, 0.36268177727104755625, 0.36103230752291903816, 0.35993921762178249235, 0.35924273721637173251, 0.35881900776503550254, 0.35857519510797425388, 0.3584443032716189137, 0.35837998986859709305, 0.35835188627127578798, 0.35834142565784521395, 0.35833838582049870602, 0.35833778977395436272, 0.35833773016929626465, 0.35833775997161865234, 0.35833775997161865234, 0.35833781957627675041, 0.35833844542514348142, 0.35834151506479905436, 0.35835197567825405329, 0.35838010907788664383, 0.35844445228323085217, 0.35857534411958619236, 0.35881912697437834403, 0.35924288622796146653, 0.35993936663339443083, 0.36103242673220858894, 0.36268186667801471934, 0.3650874493859429526, 0.36849054463685004812, 0.37317249378614242294, 0.37944614762268435992, 0.38763826439154663861, 0.39805710598688071045, 0.41093885484286774012, 0.4263645223306623544, 0.44413480388402143406, 0.46358885532464000345, 0.48353598591715890587, 0.5034777522087097168, 0.52341153138072071815, 0.54333762177133659854, 0.56325638056803262188, 0.58316798679271830697, 0.60307273876434508431, 0.62297087433447995153, 0.64286257258983370289, 0.66274801269630800871, 0.68262749199500671882, 0.70250113002679348551, 0.72236904640351506934, 0.74223147875774986293, 0.7620885466832966193, 0.78194042899408988667, 0.8017870665523814111, 0.82162887567476150519, 0.84146585681128693857, 0.86129801047056320229, 0.88112563367480334353, 0.90094872691666161302, 0.92076735034978229866, 0.9405817413105901359, 0.96039195993748860403, 0.9801979472117451353, 0.99999994039535522461]
-x=[1., 0.98019800681638991069, 0.96039201954213337942, 0.94058180091523491129, 0.92076740995417849511, 0.90094878652130649943, 0.88112563367487450883, 0.86129807007520786666, 0.84146585681128682754, 0.82162893527940628058, 0.80178712615684855081, 0.78194042899408988667, 0.76208860628779928614, 0.74223153836239463832, 0.72236910600773351909, 0.70250118963126062521, 0.68262755159965149421, 0.6627480723009527841, 0.6428626321944785893, 0.62297093393905356162, 0.60307279836863447731, 0.58316804639736308236, 0.56325644017267739727, 0.54333768137598137393, 0.52341159098536549354, 0.5034777522087097168, 0.48353601571948129356, 0.46358891492922260635, 0.44413483368634382176, 0.42636455213298485312, 0.41093888464514582992, 0.39805710598688076596, 0.38763823458911761399, 0.37944608801803952902, 0.37317243418155093826, 0.36849048503220527273, 0.36508735997898467129, 0.36268180707336994395, 0.36103233732528139388, 0.35993927722641838596, 0.35924276701869412021, 0.35881903756735789024, 0.35857525471261902927, 0.35844436287626368909, 0.35838001967093946476, 0.35835188627128689021, 0.35834145546015427897, 0.35833838582049870602, 0.35833778977395436272, 0.35833773016929626465, 0.35833773016929626465, 0.35833773016929626465, 0.35833778977395436272, 0.35833838582049870602, 0.35834145546015427897, 0.35835188627128689021, 0.35838001967093946476, 0.35844436287626368909, 0.35857525471261902927, 0.35881903756735789024, 0.35924276701869412021, 0.35993927722641838596, 0.36103233732528139388, 0.36268180707336994395, 0.36508735997898467129, 0.36849048503220527273, 0.37317243418155093826, 0.37944608801803958453, 0.3876382345891176695, 0.39805710598688071045, 0.4109388846451457189, 0.42636455213298474209, 0.44413483368634382176, 0.46358891492922260635, 0.48353601571948129356, 0.5034777522087097168, 0.52341159098536549354, 0.54333768137598137393, 0.56325644017267739727, 0.58316804639736308236, 0.60307279836863458833, 0.62297093393905367265, 0.64286263219447847828, 0.6627480723009527841, 0.68262755159965149421, 0.70250118963126062521, 0.72236910600773351909, 0.74223153836239463832, 0.76208860628779928614, 0.78194042899408988667, 0.80178712615684855081, 0.82162893527940628058, 0.84146585681128693857, 0.86129807007520797768, 0.8811256336748743978, 0.90094878652130638841, 0.92076740995417838409, 0.94058180091523491129, 0.96039201954213337942, 0.98019800681638991069, 1.]
-time=[-1., 1.]
-der(y)=[-0.99000000953674316406, -0.99020004291759233794, -0.99040424801666704369, -0.99061274525995202112, -0.99082583207015739735, -0.9910436270002810355, -0.99126636976606630203, -0.99149429814646306003, -0.99172759025218293338, -0.99196660510013168199, -0.99221158042481472084, -0.99246281349141518557, -0.99272066342331322097, -0.99298542750793195033, -0.99325752297906355626, -0.99353736622165234049, -0.99382543574330362013, -0.99412214795638853548, -0.99442809798027598234, -0.99474388368651023296, -0.99507010022746478217, -0.99540752143920541162, -0.99575686459029089104, -0.99611908237115109888, -0.99649506770919138443, -0.99688601493835449219, -0.99729305483546371036, -0.99559264192904961543, -0.93860966946652391041, -0.83312513159851875333, -0.70792993058219932934, -0.58102533212645490757, -0.46289573181661197721, -0.35893104773529521667, -0.27118509929954509596, -0.19963029783112143378, -0.14303168365897236947, -0.09953823297994711383, -0.06707093885665948996, -0.04356505470838629296, -0.02711156562217898608, -0.01603101448537177717, -0.00890306487861641967, -0.00456838393715497306, -0.00211406594246687368, -0.00084967230190864228, -0.00027843003573207027, -0.00006607340153660418, -0.00000870104059276309, -0.00000027190758349001, -0., 0.00000027190758349001, 0.00000870104059276309, 0.00006607340153660418, 0.00027843003573207239, 0.00084967230190864662, 0.00211406594246688409, 0.00456838393715495571, 0.00890306487861638671, 0.0160310144853717286, 0.02711156562217898608, 0.04356505470838629296, 0.06707093885665948996, 0.09953823297994711383, 0.14303168365897236947, 0.19963029783112143378, 0.27118509929954554005, 0.35893104773529577178, 0.46289573181661258783, 0.58102533212645424143, 0.70792993058219855218, 0.83312513159851808719, 0.93860966946652391041, 0.99559264192904961543, 0.99729305483546371036, 0.99688601493835449219, 0.99649506770919138443, 0.99611908237115109888, 0.99575686459029089104, 0.99540752143920541162, 0.99507010022746478217, 0.99474388368651023296, 0.99442809798027598234, 0.99412214795638853548, 0.99382543574330362013, 0.99353736622165234049, 0.99325752297906355626, 0.99298542750793195033, 0.99272066342331322097, 0.99246281349141518557, 0.99221158042481472084, 0.99196660510013168199, 0.99172759025218293338, 0.99149429814646306003, 0.99126636976606630203, 0.9910436270002810355, 0.99082583207015739735, 0.99061274525995202112, 0.99040424801666704369, 0.99020004291759233794, 0.99000000953674316406]
-der(x)=[-0.99000000953674316406, -0.99020004291759233794, -0.99040424801666704369, -0.99061274525995202112, -0.99082583207015739735, -0.9910436270002810355, -0.99126636976606630203, -0.99149429814646306003, -0.99172759025218293338, -0.99196660510013168199, -0.99221158042481472084, -0.99246281349141518557, -0.99272066342331322097, -0.99298542750793195033, -0.99325752297906355626, -0.99353736622165234049, -0.99382543574330362013, -0.99412214795638853548, -0.99442809798027598234, -0.99474388368651023296, -0.99507010022746478217, -0.99540752143920541162, -0.99575686459029089104, -0.99611908237115109888, -0.99649506770919138443, -0.99688601493835449219, -0.99729305483546371036, -0.99559264192904961543, -0.93860966946652391041, -0.83312513159851875333, -0.70792993058219932934, -0.58102533212645490757, -0.46289573181661197721, -0.35893104773529521667, -0.27118509929954509596, -0.19963029783112143378, -0.14303168365897236947, -0.09953823297994711383, -0.06707093885665948996, -0.04356505470838629296, -0.02711156562217898608, -0.01603101448537177717, -0.00890306487861641967, -0.00456838393715497306, -0.00211406594246687368, -0.00084967230190864228, -0.00027843003573207027, -0.00006607340153660418, -0.00000870104059276309, -0.00000027190758349001, -0., 0.00000027190758349001, 0.00000870104059276309, 0.00006607340153660418, 0.00027843003573207239, 0.00084967230190864662, 0.00211406594246688409, 0.00456838393715495571, 0.00890306487861638671, 0.0160310144853717286, 0.02711156562217898608, 0.04356505470838629296, 0.06707093885665948996, 0.09953823297994711383, 0.14303168365897236947, 0.19963029783112143378, 0.27118509929954554005, 0.35893104773529577178, 0.46289573181661258783, 0.58102533212645424143, 0.70792993058219855218, 0.83312513159851808719, 0.93860966946652391041, 0.99559264192904961543, 0.99729305483546371036, 0.99688601493835449219, 0.99649506770919138443, 0.99611908237115109888, 0.99575686459029089104, 0.99540752143920541162, 0.99507010022746478217, 0.99474388368651023296, 0.99442809798027598234, 0.99412214795638853548, 0.99382543574330362013, 0.99353736622165234049, 0.99325752297906355626, 0.99298542750793195033, 0.99272066342331322097, 0.99246281349141518557, 0.99221158042481472084, 0.99196660510013168199, 0.99172759025218293338, 0.99149429814646306003, 0.99126636976606630203, 0.9910436270002810355, 0.99082583207015739735, 0.99061274525995202112, 0.99040424801666704369, 0.99020004291759233794, 0.99000000953674316406]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_RegNonZeroPowerDerivative_2_Check.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_RegNonZeroPowerDerivative_2_Check.txt
deleted file mode 100644
index 26ac8b9e..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_RegNonZeroPowerDerivative_2_Check.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-last-generated=2015-08-18
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "2",
- "linear": " "
-}
-y=[1.58008265495300292969, 1.54879376288187486921, 1.51749864598270112204, 1.48619699851325703932, 1.45488855610080825009, 1.42357353129078023635, 1.39225137980569879659, 1.36092207574832269046, 1.32958559331108205903, 1.29824162650583341261, 1.26688991108170045941, 1.2355305405074774594, 1.20416297024271834459, 1.17278717451992720022, 1.14140279571208802523, 1.11000992739002879439, 1.07860790559980435077, 1.04719670467538406022, 1.01577606064655578955, 0.98434548820583345208, 0.95290478295475145032, 0.92145368101450864096, 0.8899916968989179944, 0.85881772355351637671, 0.82928046330101945482, 0.80242669582366943359, 0.77876789575377414199, 0.75844972560561652042, 0.74137938211216047879, 0.72731793774604425185, 0.71594679060249322156, 0.70691395001015733257, 0.69986533688895646854, 0.69446462311448253768, 0.690405131670549288, 0.68741583677946083153, 0.68526363362434161708, 0.68375229897313138938, 0.6827207210021870587, 0.68203920129345252388, 0.681605815839622875, 0.68134242289482938038, 0.68119102718550905706, 0.6811097264274135199, 0.68106979132082301476, 0.68105238676000112719, 0.68104588985477754193, 0.68104398250585829189, 0.6810436248779296875, 0.68104356527328491211, 0.68104356527328491211, 0.68104356527328491211, 0.6810436248779296875, 0.68104398250585829189, 0.68104588985477754193, 0.68105238676000112719, 0.68106979132082301476, 0.6811097264274135199, 0.68119102718550905706, 0.68134242289482938038, 0.681605815839622875, 0.68203920129345252388, 0.6827207210021870587, 0.68375229897313138938, 0.68526363362434161708, 0.68741583677946083153, 0.69040513167054939903, 0.69446462311448253768, 0.69986533688895657956, 0.70691395001015733257, 0.71594679060249322156, 0.72731793774604425185, 0.74137938211216047879, 0.75844972560561652042, 0.77876789575377414199, 0.80242669582366943359, 0.82928046330101945482, 0.85881772355351637671, 0.8899916968989179944, 0.92145368101450864096, 0.95290478295475167236, 0.9843454882058335631, 1.0157760606465555675, 1.04719670467538406022, 1.07860790559980435077, 1.11000992739002879439, 1.14140279571208802523, 1.17278717451992720022, 1.20416297024271834459, 1.2355305405074774594, 1.26688991108170045941, 1.29824162650583341261, 1.32958559331108205903, 1.3609220757483229125, 1.39225137980569857454, 1.42357353129078023635, 1.45488855610080802805, 1.48619699851325703932, 1.51749864598270112204, 1.54879376288187486921, 1.58008265495300292969]
-x=[-4., -3.7647676662875144693, -3.53894424426084697188, -3.32233598386847495121, -3.11475188544088288367, -2.91600012214852899461, -2.72588805835286018819, -2.54422389744777888154, -2.37081621547582921394, -2.20547205048691452589, -2.04800000617912303369, -1.89820823206722022469, -1.75590402572382986435, -1.62089591945910016513, -1.49299186650388882036, -1.37200004951551934873, -1.25772794115862907027, -1.14998386585390344194, -1.04857606810546033493, -0.95331195791675493734, -0.86399992009979464935, -0.78044808734131043693, -0.70246397558124273885, -0.62985591588017997289, -0.56243205346707880743, -0.5, -0.44236803065666635559, -0.38934398577181444923, -0.34073600731940267838, -0.29635202706725227717, -0.25600000082932250489, -0.21948800325919479159, -0.18662398343587421889, -0.15721599267384533949, -0.13107200856844480885, -0.10799999009773934844, -0.08780799695560674578, -0.07030400674335453293, -0.05529600386324330652, -0.04259200092127690684, -0.03200000011782754006, -0.02332799796004312448, -0.01638400108495946875, -0.01097599962142444679, -0.00691200049075938253, -0.00400000001823303843, -0.00204800013913925081, -0.0008640000633404392, -0.00025600001829363304, -0.00003200000252273844, -0., 0.00003200000252273844, 0.00025600001829363309, 0.0008640000633404392, 0.00204800013913925992, 0.00400000001823305057, 0.00691200049075940248, 0.01097599962142442251, 0.01638400108495943405, 0.02332799796004308285, 0.03200000011782754006, 0.04259200092127690684, 0.05529600386324330652, 0.07030400674335453293, 0.08780799695560674578, 0.10799999009773933456, 0.13107200856844494763, 0.15721599267384550602, 0.18662398343587438543, 0.21948800325919459731, 0.25600000082932233836, 0.29635202706725205513, 0.34073600731940267838, 0.38934398577181444923, 0.44236803065666635559, 0.5, 0.56243205346707880743, 0.62985591588017997289, 0.70246397558124273885, 0.78044808734131043693, 0.86399992009979509344, 0.95331195791675538143, 1.0485760681054596688, 1.14998386585390344194, 1.25772794115862907027, 1.37200004951551934873, 1.49299186650388882036, 1.62089591945910016513, 1.75590402572382986435, 1.89820823206722022469, 2.04800000617912303369, 2.20547205048691452589, 2.37081621547583010212, 2.54422389744778021381, 2.72588805835285930002, 2.91600012214852810644, 3.11475188544088199549, 3.32233598386847495121, 3.53894424426084697188, 3.7647676662875144693, 4.]
-time=[-1., 1.]
-der(y)=[-1.56428182125091552734, -1.56459784538276314159, -1.56492054427516857906, -1.565250039060998688, -1.56558668641883902417, -1.56593084293902595761, -1.56628274909132891857, -1.5666428807010954749, -1.56701159428384162453, -1.56738924966521175897, -1.56777632259893051625, -1.56817328872517802729, -1.56858062724529689902, -1.56899905225037583634, -1.56942892137169431876, -1.56987118694327465462, -1.57032632844321495824, -1.57079517903944898549, -1.57127857173250684575, -1.57177758228979747024, -1.57229304376329404036, -1.57282614662834507868, -1.57337808525626776657, -1.52924956991465443856, -1.41594339137165525777, -1.26530778408050537109, -1.09946510263682939446, -0.9331989804460166793, -0.77587987806802349855, -0.63295879959662249004, -0.50711640264862756222, -0.399133378477892653, -0.30853972030164872331, -0.2340924175727897294, -0.17411764429574042023, -0.12675171158517828385, -0.09010457807638229399, -0.06236577461358307206, -0.04186960419191831234, -0.02713055612207104436, -0.01685831947768127656, -0.00995910723585354159, -0.00552801480249395273, -0.00283575750774622999, -0.00131209268541346638, -0.00052731608604806332, -0.0001727928679108674, -0.00004100469028050078, -0.00000539979811053825, -0.00000016874369599522, -0., 0.00000016874369599522, 0.00000539979811053825, 0.00004100469028050078, 0.00017279286791086872, 0.00052731608604806603, 0.00131209268541347289, 0.00283575750774621915, 0.00552801480249393191, 0.0099591072358535121, 0.01685831947768127656, 0.02713055612207104436, 0.04186960419191831234, 0.06236577461358306512, 0.09010457807638229399, 0.12675171158517828385, 0.17411764429574072555, 0.23409241757279009022, 0.3085397203016491674, 0.39913337847789209789, 0.50711640264862700711, 0.63295879959662171288, 0.77587987806802349855, 0.9331989804460166793, 1.09946510263682939446, 1.26530778408050537109, 1.41594339137165525777, 1.52924956991465443856, 1.57337808525626776657, 1.57282614662834507868, 1.57229304376329404036, 1.57177758228979747024, 1.57127857173250684575, 1.57079517903944898549, 1.57032632844321495824, 1.56987118694327465462, 1.56942892137169431876, 1.56899905225037583634, 1.56858062724529689902, 1.56817328872517802729, 1.56777632259893051625, 1.56738924966521175897, 1.56701159428384162453, 1.5666428807010954749, 1.56628274909132891857, 1.56593084293902595761, 1.56558668641883902417, 1.565250039060998688, 1.56492054427516857906, 1.56459784538276314159, 1.56428182125091552734]
-der(x)=[12., 11.52479985290483277538, 11.05920078227849856489, 10.60320001270293133189, 10.15679990238226793053, 9.72000078315463689194, 9.29280005058265068385, 8.87519997703648755305, 8.46720080920755968634, 8.06880011363915627953, 7.67999960003033699252, 7.30080038360693261978, 6.9312002018735814346, 6.57119972503699134592, 6.22079942993432055687, 5.88000031528394107028, 5.54879987522185302851, 5.22719961711935354742, 4.91520045387108783785, 4.61280005058293429698, 4.31999982948174121589, 4.03680014079985216569, 3.76320001270293280626, 3.49919982860546285863, 3.24480032974199072981, 3., 2.76480019582733804739, 2.53919997579601020021, 2.32320001270293152729, 2.11680020261687351635, 1.91999990015040311597, 1.73280005058279251706, 1.55519985782634528881, 1.38719996889115471106, 1.22880011363958052684, 1.07999995765678402648, 0.94080000320435031025, 0.81120008266429199928, 0.69120004908553134282, 0.58080000320433222694, 0.47999997510914310661, 0.38879996462828886328, 0.30720002849574651327, 0.23520000081538874892, 0.17280001233577582664, 0.11999999381303946833, 0.07680000716685865536, 0.04320000311612892663, 0.01920000181317296772, 0.00480000046402210591, 0.000000000000000001, 0.00480000046402210591, 0.01920000181317296772, 0.04320000311612892663, 0.07680000716685887741, 0.11999999381303971813, 0.17280001233577615971, 0.2352000008153883881, 0.30720002849574606918, 0.38879996462828841919, 0.47999997510914310661, 0.58080000320433222694, 0.69120004908553134282, 0.81120008266429199928, 0.94080000320435031025, 1.07999995765678402648, 1.22880011363958141501, 1.38719996889115559924, 1.55519985782634639904, 1.73280005058279162888, 1.91999990015040200575, 2.11680020261687218408, 2.32320001270293152729, 2.53919997579601020021, 2.76480019582733804739, 3., 3.24480032974199072981, 3.49919982860546285863, 3.76320001270293280626, 4.03680014079985216569, 4.31999982948174299224, 4.61280005058293607334, 4.9152004538710860615, 5.22719961711935354742, 5.54879987522185302851, 5.88000031528394107028, 6.22079942993432055687, 6.57119972503699134592, 6.9312002018735814346, 7.30080038360693261978, 7.67999960003033699252, 8.06880011363915627953, 8.4672008092075614627, 8.87519997703648932941, 9.29280005058264890749, 9.72000078315463511558, 10.15679990238226615418, 10.60320001270293133189, 11.05920078227849856489, 11.52479985290483277538, 12.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_RegStep.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_RegStep.txt
deleted file mode 100644
index 0947356d..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_RegStep.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-last-generated=2016-03-15
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-y=[-1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., 0.00000000000311728421, 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-time=[-1., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_SmoothExponentialDerivativeCheck.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_SmoothExponentialDerivativeCheck.txt
deleted file mode 100644
index f34520a7..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_SmoothExponentialDerivativeCheck.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2015-08-18
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "1",
- "linear": " "
-}
-y=[0.36787945032119750977, 0.39016248943336417909, 0.41282308636167630578, 0.43579467855936682152, 0.4590078190906932698, 0.48239109106783190084, 0.50587176716285564559, 0.529376165976026547, 0.55283036737658453053, 0.57616107823956752565, 0.59929580866431619857, 0.62395276727584580989, 0.65398924034394878557, 0.68704779572987739744, 0.72107045732876551281, 0.75458482918776059734, 0.78657801059420417999, 0.81639228004051334064, 0.84364108359833756001, 0.86814159699102655399, 0.88985952147569358228, 0.90886656931969345141, 0.92530661999949248564, 0.93936951334122720247, 0.951270927342498962, 0.96123808622360229492, 0.96949821301234828663, 0.9762710953838101835, 0.98176389872694735939, 0.98616778587568099113, 0.98965615123764827388, 0.99238371790468826728, 0.99448675044670864498, 0.99608361744987616859, 0.99727594814813691482, 0.99814957422927275132, 0.9987763762775506704, 0.99921542388148087976, 0.99951457970508361672, 0.99971199034665758631, 0.99983745814750868419, 0.99991363288922485708, 0.99995744227750194, 0.99998092651412484599, 0.99999243020903438861, 0.99999749660511927374, 0.99999934434880088929, 0.9999998807906904652, 1., 1., 1., 1., 0.99999994039535522461, 0.99999982118604568981, 0.9999992847441561139, 0.99999737739582972296, 0.9999923109997048698, 0.99998074770019051982, 0.99995726346362090453, 0.99991345407529053091, 0.99983721972897399155, 0.99971181153270549657, 0.99951434128650451516, 0.9992151854629017782, 0.99877613785897156884, 0.99814933581069364976, 0.99727570972955781325, 0.99608337903129706703, 0.99448651202812954342, 0.99238347948618021999, 0.98965597242371394771, 0.98616760706174666495, 0.98176371991304856035, 0.97627097617452063272, 0.96949809380305873585, 0.96123802661895751953, 0.95127086773756996951, 0.93936939413193765169, 0.92530656039481218311, 0.90886650971504867602, 0.88985946187104869587, 0.86814159699095538869, 0.84364108359833778206, 0.81639228004051334064, 0.78657807019874237398, 0.75458488879240537273, 0.7210705169334102882, 0.68704791493902483968, 0.65398935955323833635, 0.62395288648513536067, 0.59929598747825052474, 0.57616125705350185182, 0.55283054619051874568, 0.52937640439460542652, 0.50587200558136380391, 0.48239129968408878124, 0.45900802770707443967, 0.43579488717562353539, 0.41282329497777314753, 0.39016266824729850526, 0.36787962913513183594]
-y_comp=[0.36787945032119750977, 0.39016251923554445824, 0.41282311616383882136, 0.43579470836168920922, 0.45900784889314000248, 0.48239112087015428854, 0.50587176716285564559, 0.52937616597623970982, 0.55283036737658453053, 0.57616107823956752565, 0.59929580866431619857, 0.6239527076712010345, 0.65398924034394878557, 0.68704779572973528889, 0.72107045732833918716, 0.75458482918776059734, 0.78657801059409759858, 0.81639222043586856525, 0.84364108359812439719, 0.8681415373863817786, 0.88985946187104880689, 0.90886650971504867602, 0.9253066199994569585, 0.93936945373658242708, 0.95127086773785418661, 0.96123802661895751953, 0.96949815340770351124, 0.97627103577916540811, 0.98176383912230258399, 0.98616772627084081648, 0.98965609163300349849, 0.99238359869546977077, 0.9944866312374190942, 0.9960835578452313932, 0.99727582893895394545, 0.99814951462462797593, 0.99877631667290589501, 0.99921536427669399583, 0.99951452010043884133, 0.99971193074199504736, 0.9998373985428639088, 0.99991357328458008169, 0.99995738267291045531, 0.9999808669094800706, 0.99999243020899442058, 0.99999743700049670281, 0.99999934434880088929, 0.9999998807906904652, 1., 1., 1., 1., 1., 0.9999998807906904652, 0.99999934434880088929, 0.99999743700049670281, 0.99999243020899442058, 0.9999808669094800706, 0.99995738267291045531, 0.99991357328458008169, 0.9998373985428639088, 0.99971193074199504736, 0.99951452010043884133, 0.99921536427669399583, 0.99877631667290589501, 0.99814951462462797593, 0.99727582893895394545, 0.9960835578452313932, 0.9944866312374190942, 0.99238359869546977077, 0.98965609163300349849, 0.98616772627084081648, 0.98176383912230258399, 0.97627103577916540811, 0.96949815340770351124, 0.96123802661895751953, 0.95127086773785418661, 0.93936945373658242708, 0.9253066199994569585, 0.90886650971504867602, 0.88985946187104869587, 0.86814153738638166757, 0.84364108359812461924, 0.81639222043586856525, 0.78657801059409759858, 0.75458482918776059734, 0.72107045732833918716, 0.68704779572973528889, 0.65398924034394878557, 0.6239527076712010345, 0.59929580866431619857, 0.57616107823956752565, 0.5528303673765844195, 0.52937616597623948778, 0.50587176716285575662, 0.48239112087015445507, 0.4590078488931401135, 0.43579470836168920922, 0.41282311616383882136, 0.39016251923554445824, 0.36787945032119750977]
-ex=[0.36787945032119750977, 0.39016251923554445824, 0.41282311616383882136, 0.43579470836168920922, 0.45900784889314000248, 0.48239112087015428854, 0.50587176716285564559, 0.52937616597623970982, 0.55283036737658453053, 0.57616107823956752565, 0.59929580866431619857, 0.62216368044210867971, 0.64469622498412382239, 0.66682745068661852805, 0.68849447445239264631, 0.70963822548336397134, 0.73020351655322424111, 0.75013961969758968795, 0.76940022541511066123, 0.78794420196955716751, 0.80573531070381043673, 0.82274250783797930886, 0.83894008585241020004, 0.85430760786042336807, 0.86882983285769810333, 0.88249689340591430664, 0.89530395792934958088, 0.90725112438388422209, 0.91834330430602317819, 0.92858999317717549893, 0.93800497321000431139, 0.9466062764452556344, 0.95441568423156653012, 0.96145838616995982218, 0.96776306414004131806, 0.9733612568313895208, 0.97828722027172376752, 0.98257756040317578705, 0.986271082425775103, 0.98940849286764309678, 0.99203193222494623349, 0.9941849715317574443, 0.99591237278558664148, 0.99725973609506912698, 0.99827349173989166076, 0.99900048975466049228, 0.99948811527461778326, 0.99978405235651113259, 0.99993598460678168038, 0.99999201297694728652, 1., 0.99999201297694728652, 0.99993598460678168038, 0.99978405235651113259, 0.99948811527461778326, 0.99900048975466049228, 0.99827349173989166076, 0.99725973609506912698, 0.99591237278558664148, 0.9941849715317574443, 0.99203193222494623349, 0.98940849286764309678, 0.986271082425775103, 0.98257756040317578705, 0.97828722027172376752, 0.9733612568313895208, 0.96776306414004131806, 0.96145838616995971115, 0.95441568423156653012, 0.9466062764452556344, 0.93800497321000442241, 0.92858999317717560995, 0.91834330430602317819, 0.90725112438388422209, 0.89530395792934958088, 0.88249689340591430664, 0.86882983285769810333, 0.85430760786042336807, 0.83894008585241020004, 0.82274250783797930886, 0.80573531070381032571, 0.78794420196955705649, 0.76940022541511077225, 0.75013961969758968795, 0.73020351655322424111, 0.70963822548336397134, 0.68849447445239264631, 0.66682745068661852805, 0.64469622498412382239, 0.62216368044210867971, 0.59929580866431619857, 0.57616107823956752565, 0.5528303673765844195, 0.52937616597623948778, 0.50587176716285575662, 0.48239112087015445507, 0.4590078488931401135, 0.43579470836168920922, 0.41282311616383882136, 0.39016251923554445824, 0.36787945032119750977]
-time=[-1., 1.]
-der(y_comp)=[1.10363829135894775391, 1.12413622719403560879, 1.14137337886531664566, 1.15520465225710067259, 1.16551268781103134486, 1.17221044869655899312, 1.17524135075672186979, 1.1745798567220375741, 1.17023146915177145289, 1.16223216394622164138, 1.15064787048344174814, 1.38316742875028175774, 1.59732453336105906239, 1.6915050922961181179, 1.69859142318402378535, 1.64449612698309621805, 1.54940839559011633852, 1.42884904929875267143, 1.2945588618528913738, 1.15523978724761966497, 1.01717706294168386272, 0.88475029536503246863, 0.76085333610501526547, 0.64724123920581722036, 0.54480746780698574572, 0.45380732417106628418, 0.37403814068162477557, 0.30497816559096319056, 0.2458969271527447209, 0.19593852828727653659, 0.15418526910511987094, 0.11970484269689116164, 0.09158368877643877082, 0.06895104443380883907, 0.05099431262142999771, 0.03696878658599472151, 0.02620273215593660332, 0.01809890351345107284, 0.01213382324599989251, 0.00785520694858242961, 0.00487819884449655107, 0.00288079042193590011, 0.00159871841470406433, 0.00082001996440621988, 0.00037939932538692074, 0.00015247296366353017, 0.00004996246460431022, 0.00001185633451727546, 0.00000156132828966287, 0.00000004879151050952, 0., -0.00000004879151050952, -0.00000156132828966287, -0.00001185633451727546, -0.0000499624646043106, -0.00015247296366353093, -0.00037939932538692258, -0.00082001996440621684, -0.00159871841470405848, -0.00288079042193589143, -0.00487819884449655107, -0.00785520694858242961, -0.01213382324599989251, -0.01809890351345107284, -0.02620273215593660332, -0.03696878658599472151, -0.05099431262143008792, -0.0689510444338089501, -0.0915836887764389096, -0.11970484269689098122, -0.15418526910511964889, -0.19593852828727628679, -0.2458969271527447209, -0.30497816559096319056, -0.37403814068162477557, -0.45380732417106628418, -0.54480746780698574572, -0.64724123920581722036, -0.76085333610501526547, -0.88475029536503246863, -1.01717706294168452885, -1.15523978724762055315, -1.29455886185289048562, -1.42884904929875267143, -1.54940839559011633852, -1.64449612698309621805, -1.69859142318402378535, -1.6915050922961181179, -1.59732453336105906239, -1.38316742875028197979, -1.15064787048344174814, -1.16223216394622164138, -1.17023146915177145289, -1.1745798567220375741, -1.17524135075672186979, -1.17221044869655899312, -1.16551268781103134486, -1.15520465225710067259, -1.14137337886531664566, -1.12413622719403560879, -1.10363829135894775391]
-der(y)=[1.10363829135894775391, 1.12413622719403560879, 1.14137337886531664566, 1.15520465225710067259, 1.16551268781103134486, 1.17221044869655899312, 1.17524135075672186979, 1.1745798567220375741, 1.17023146915177145289, 1.16223216394622164138, 1.15064787048344174814, 1.38316742875028175774, 1.59732453336105906239, 1.6915050922961181179, 1.69859142318402378535, 1.64449612698309621805, 1.54940839559011633852, 1.42884904929875267143, 1.2945588618528913738, 1.15523978724761966497, 1.01717706294168386272, 0.88475029536503246863, 0.76085333610501526547, 0.64724123920581722036, 0.54480746780698574572, 0.45380732417106628418, 0.37403814068162477557, 0.30497816559096319056, 0.2458969271527447209, 0.19593852828727653659, 0.15418526910511987094, 0.11970484269689116164, 0.09158368877643877082, 0.06895104443380883907, 0.05099431262142999771, 0.03696878658599472151, 0.02620273215593660332, 0.01809890351345107284, 0.01213382324599989251, 0.00785520694858242961, 0.00487819884449655107, 0.00288079042193590011, 0.00159871841470406433, 0.00082001996440621988, 0.00037939932538692074, 0.00015247296366353017, 0.00004996246460431022, 0.00001185633451727546, 0.00000156132828966287, 0.00000004879151050952, 0., -0.00000004879151050952, -0.00000156132828966287, -0.00001185633451727546, -0.0000499624646043106, -0.00015247296366353093, -0.00037939932538692258, -0.00082001996440621684, -0.00159871841470405848, -0.00288079042193589143, -0.00487819884449655107, -0.00785520694858242961, -0.01213382324599989251, -0.01809890351345107284, -0.02620273215593660332, -0.03696878658599472151, -0.05099431262143008792, -0.0689510444338089501, -0.0915836887764389096, -0.11970484269689098122, -0.15418526910511964889, -0.19593852828727628679, -0.2458969271527447209, -0.30497816559096319056, -0.37403814068162477557, -0.45380732417106628418, -0.54480746780698574572, -0.64724123920581722036, -0.76085333610501526547, -0.88475029536503246863, -1.01717706294168452885, -1.15523978724762055315, -1.29455886185289048562, -1.42884904929875267143, -1.54940839559011633852, -1.64449612698309621805, -1.69859142318402378535, -1.6915050922961181179, -1.59732453336105906239, -1.38316742875028197979, -1.15064787048344174814, -1.16223216394622164138, -1.17023146915177145289, -1.1745798567220375741, -1.17524135075672186979, -1.17221044869655899312, -1.16551268781103134486, -1.15520465225710067259, -1.14137337886531664566, -1.12413622719403560879, -1.10363829135894775391]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_SpliceFunction.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_SpliceFunction.txt
deleted file mode 100644
index 1928d007..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_SpliceFunction.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-y=[-10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -10., -9.9999341963249435139, -9.95764823075234950522, -9.61288517592871905038, -8.80138498460092222331, -7.61594229742106509917, -6.20945495927315072038, -4.69575384939515139138, -3.13948647802840108412, -1.57073162303538516049, -0.00000046813281229241, 1.57073302706681916519, 3.13948554566464288484, 4.69575292932659937861, 6.20945627530917843018, 7.61594152450561523438, 8.80138586598050665089, 9.61288480189125671416, 9.95764825660255326056, 9.99993419673478456389, 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10.]
-time=[-1., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_SpliceFunctionDerivativeCheck.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_SpliceFunctionDerivativeCheck.txt
deleted file mode 100644
index 20f99254..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Math_Functions_Examples_SpliceFunctionDerivativeCheck.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-last-generated=2015-08-18
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "1",
- "linear": " "
-}
-y=[-10., -8.80388727157727579709, -7.76066886103235287209, -6.84539280771493086064, -6.0340660438167565971, -5.30496108600483662343, -4.64313093101239893201, -4.0456710639121649109, -3.51298088866822366683, -3.04006688011215153722, -2.62143970231305534213, -2.25199654235701185456, -1.92699947752650824206, -1.64206480373948493501, -1.39314034606648373682, -1.17649007116983139731, -0.98867475798393278374, -0.82653932234873850327, -0.6871948582260736238, -0.56800231738621220767, -0.4665598967428166155, -0.38068700563090707156, -0.30840977252498713579, -0.2479490504498653991, -0.19770614768107006021, -0.15625, -0.12230592405704432402, -0.09474295858788425728, -0.07251586263125843479, -0.05425593995630223487, -0.0392473375695109386, -0.02751017611318867795, -0.01878694120466852663, -0.01254356935333953392, -0.00819813965525247393, -0.00524218661946153786, -0.00327352867733093, -0.00199032323081690596, -0.00117326708835110158, -0.0006667297229297713, -0.00036244795438178926, -0.0001865407101839163, -0.00008960474821446588, -0.00003936924163152269, -0.00001536026911905356, -0.00000508346105978453, -0.00000132192733157466, -0.00000023412175122458, -0.00000002050190238385, -0.00000000032004284111, -0., -0.00000000031995729838, -0.00000002045810273997, -0.00000023243797765905, -0.00000129950225624668, -0.00000491638144523785, -0.00001449817526371029, -0.00003591721095331928, -0.00007812322633701166, -0.00015339975273659598, -0.00027690863494690492, -0.00046505041183304418, -0.00073202847653583121, -0.001083857454116879, -0.00150896070654321559, -0.00196463215336001654, -0.0023594886189480615, -0.00253495945870907359, -0.00225704177646930508, -0.00124883579861363096, 0.00067457110280275232, 0.00333080276958045525, 0.00612513195579493085, 0.00922189973143772157, 0.01352605784398098858, 0.01953125, 0.0277990681700139089, 0.03904304415372368553, 0.05416169188381672606, 0.07427660863193349949, 0.10077692784162392559, 0.13537085633229845039, 0.18014401933005336209, 0.23762672295100006892, 0.3108709763123809755, 0.40353614459622672017, 0.5199868052318652456, 0.66540400581420677817, 0.84590653401173332426, 1.06868958722072693313, 1.34217709540169782834, 1.67619563646542180102, 2.08215796976846112543, 2.57326922751210096507, 3.15998044877867023672, 3.81391652784853274483, 4.48465577442976304212, 5.15397270574675925303, 5.83126476017807515717, 6.53732278516330200802, 7.29596662521362304688]
-x=[-1., -0.94119191657187861733, -0.88473606106521174297, -0.8305839959671187378, -0.77868797136022072092, -0.72900003053713224865, -0.68147201458821504705, -0.63605597436194472039, -0.59270405386895730349, -0.55136801262172863147, -0.51200000154478075842, -0.47455205801680505617, -0.43897600643095746609, -0.40522397986477504128, -0.37324796662597220509, -0.34300001237887983718, -0.31443198528965726757, -0.28749596646347586049, -0.26214401702636508373, -0.23832798947918873433, -0.21599998002494866234, -0.19511202183532760923, -0.17561599389531068471, -0.15746397897004499322, -0.14060801336676970186, -0.125, -0.1105920076641665889, -0.09733599644295361231, -0.0851840018298506696, -0.07408800676681306929, -0.06400000020733062622, -0.0548720008147986979, -0.04665599585896855472, -0.03930399816846133487, -0.03276800214211120221, -0.02699999752443483711, -0.02195199923890168645, -0.01757600168583863323, -0.01382400096581082663, -0.01064800023031922671, -0.00800000002945688501, -0.00583199949001078112, -0.00409600027123986719, -0.0027439999053561117, -0.00172800012268984563, -0.00100000000455825961, -0.0005120000347848127, -0.0002160000158351098, -0.00006400000457340826, -0.00000800000063068461, -0., 0.00000800000063068461, 0.00006400000457340827, 0.0002160000158351098, 0.00051200003478481498, 0.00100000000455826264, 0.00172800012268985062, 0.00274399990535610563, 0.00409600027123985851, 0.00583199949001077071, 0.00800000002945688501, 0.01064800023031922671, 0.01382400096581082663, 0.01757600168583863323, 0.02195199923890168645, 0.02699999752443483364, 0.03276800214211123691, 0.03930399816846137651, 0.04665599585896859636, 0.05487200081479864933, 0.06400000020733058459, 0.07408800676681301378, 0.0851840018298506696, 0.09733599644295361231, 0.1105920076641665889, 0.125, 0.14060801336676970186, 0.15746397897004499322, 0.17561599389531068471, 0.19511202183532760923, 0.21599998002494877336, 0.23832798947918884536, 0.2621440170263649172, 0.28749596646347586049, 0.31443198528965726757, 0.34300001237887983718, 0.37324796662597220509, 0.40522397986477504128, 0.43897600643095746609, 0.47455205801680505617, 0.51200000154478075842, 0.55136801262172863147, 0.59270405386895752553, 0.63605597436194505345, 0.681472014588214825, 0.72900003053713202661, 0.77868797136022049887, 0.8305839959671187378, 0.88473606106521174297, 0.94119191657187861733, 1.]
-time=[-1., 1.]
-der(y)=[64.05605316162109375, 55.7716374267547152499, 48.75805981778367481638, 42.97028414104632076942, 38.34707308892477328754, 34.69483585141377801619, 31.50501708483471929867, 28.22493511550162637036, 25.09272017167625890011, 22.24439146732773053827, 19.6607994835719530613, 17.32304894037302034349, 15.21315289636172707333, 13.31403933532318717425, 11.60950337227093775994, 10.08420077392707803199, 8.72360088782045828282, 7.51399417252233092768, 6.44245172926821485504, 5.49679687614112921779, 4.66559890830686718743, 3.93814120518374366497, 3.30439059952502134365, 2.7549895615439790042, 2.28122467565281450419, 1.875, 1.52882402626949986946, 1.23577810245496766406, 0.99986573483791152395, 0.83147512392710432039, 0.66824097481261590659, 0.50777629711529592704, 0.36921036523283623509, 0.26007018832530826025, 0.17873134779877516976, 0.12020737842667049422, 0.07915787204041135894, 0.05097419794442885344, 0.03201468717722074503, 0.01953044782125351944, 0.01150521080517397446, 0.00649114985396444504, 0.00346698538776924131, 0.00172404813255259168, 0.00077875457025459115, 0.00030750913034024362, 0.00009956460930444998, 0.0000234542524654322, 0.0000030769274074412, 0.0000000960192654154, 0., -0.00000009598076819578, -0.0000030670725750811, -0.00002320168572952152, -0.00009704179415454639, -0.00029247196850739276, -0.00071409760392310989, -0.00150213247990212974, -0.00282115543134417186, -0.00483414214805850777, -0.00765618821133640364, -0.01128123445250229367, -0.01547442492161453693, -0.01962326082983968656, -0.02254609006491905751, -0.02227608616717094772, -0.01589826636745391569, 0.00032076968276240764, 0.02988074798125587087, 0.07273248227821921263, 0.11830962708010285545, 0.14126226337279160217, 0.13866765987779991476, 0.18042894155492708586, 0.25361357828398156666, 0.3515625, 0.48113768896077607762, 0.6507174741128134432, 0.87045577257017714423, 1.15256801606567638174, 1.51165390750698347411, 1.96506083111593521373, 2.53327535201000486609, 3.24036449672279891487, 4.11446871218348331212, 5.18832183473610086821, 6.49983537202321137727, 8.09275163792024088139, 10.01731402786546709649, 12.33103262229887597812, 15.0994922116004310908, 18.39726960119933352189, 22.30883592709701090939, 26.92650252721101367115, 31.48662642085429297367, 33.4301267695779671385, 33.50585571010530117064, 33.5187035144330209846, 34.39015363699290617205, 36.41614674760178615998, 39.649257659912109375]
-der(x)=[3., 2.88119996322620819384, 2.76480019556962464122, 2.65080000317573283297, 2.53919997559556698263, 2.43000019578865922298, 2.32320001264566267096, 2.21879999425912188826, 2.11680020230188992159, 2.01720002840978906988, 1.91999990000758424813, 1.82520009590173315495, 1.73280005046839535865, 1.64279993125924783648, 1.55519985748358013922, 1.47000007882098526757, 1.38719996880546325713, 1.30679990427983838686, 1.22880011346777195946, 1.15320001264573357425, 1.07999995737043530397, 1.00920003519996304142, 0.94080000317573320157, 0.87479995715136571466, 0.81120008243549768245, 0.75, 0.69120004895683451185, 0.63479999394900255005, 0.58080000317573288182, 0.52920005065421837909, 0.47999997503760077899, 0.43320001264569812927, 0.3887999644565863222, 0.34679999222278867776, 0.30720002840989513171, 0.26999998941419600662, 0.23520000080108757756, 0.20280002066607299982, 0.1728000122713828357, 0.14520000080108305673, 0.11999999377728577665, 0.09719999115707221582, 0.07680000712393662832, 0.05880000020384718723, 0.04320000308394395666, 0.02999999845325986708, 0.01920000179171466384, 0.01080000077903223166, 0.00480000045329324193, 0.00120000011600552648, 0.00000000000000000025, 0.00120000011600552648, 0.00480000045329324193, 0.01080000077903223166, 0.01920000179171471935, 0.02999999845325992953, 0.04320000308394403993, 0.05880000020384709702, 0.07680000712393651729, 0.0971999911570721048, 0.11999999377728577665, 0.14520000080108305673, 0.1728000122713828357, 0.20280002066607299982, 0.23520000080108757756, 0.26999998941419600662, 0.30720002840989535375, 0.34679999222278889981, 0.38879996445658659976, 0.43320001264569790722, 0.47999997503760050144, 0.52920005065421804602, 0.58080000317573288182, 0.63479999394900255005, 0.69120004895683451185, 0.75, 0.81120008243549768245, 0.87479995715136571466, 0.94080000317573320157, 1.00920003519996304142, 1.07999995737043574806, 1.15320001264573401834, 1.22880011346777151537, 1.30679990427983838686, 1.38719996880546325713, 1.47000007882098526757, 1.55519985748358013922, 1.64279993125924783648, 1.73280005046839535865, 1.82520009590173315495, 1.91999990000758424813, 2.01720002840978906988, 2.11680020230189036567, 2.21879999425912233235, 2.32320001264566222687, 2.43000019578865877889, 2.53919997559556653854, 2.65080000317573283297, 2.76480019556962464122, 2.88119996322620819384, 3.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_Density_pTX.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_Density_pTX.txt
deleted file mode 100644
index 168fa32f..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_Density_pTX.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-last-generated=2015-11-05
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-den.d=[1.16439318656921386719, 1.16419506072554401754, 1.16399693488190081325, 1.16379892824753383707, 1.16360104082245641166, 1.16340315343423839067, 1.16320538518159111163, 1.16300761700266264143, 1.16280996795941149458, 1.16261243827246096849, 1.16241490843851735804, 1.16221737860457352554, 1.16201996797991924382, 1.16182267656455473492, 1.1616253852961833104, 1.16142821323710143666, 1.16123116009332272291, 1.16103410724342381855, 1.160837054393738077, 1.16064012045939080053, 1.16044330602785783491, 1.16024649130322665691, 1.16004979608098324206, 1.15985310085873982722, 1.15965652455268775078, 1.1594600677490234375, 1.15926361065226091185, 1.15906715414169481093, 1.15887081625422183606, 1.15867459757653556984, 1.15847837948334086988, 1.15828228001501543076, 1.15808618054711609524, 1.1578902008720741712, 1.1576943398223276116, 1.15749847877258127404, 1.15730273751569190388, 1.15710699567580355129, 1.15691125383591519871, 1.15671575041460594768, 1.15652012836665085693, 1.15632474415463115669, 1.1561293599426112344, 1.15593397631323546726, 1.1557387113106472043, 1.15554356551706449707, 1.15534842030577045158, 1.15515339372211656155, 1.15495836713860500211, 1.1547634603451792934, 1.15456855297088623047, 1.15533077789585747475, 1.15609395649741863998, 1.15685820798315419644, 1.15762340858273593547, 1.15838968662440455759, 1.15915703755194710034, 1.15992534215609088832, 1.1606946004368192682, 1.16146493160186414784, 1.16223633105309698266, 1.16300868877450103156, 1.16378200017277944056, 1.16455650366537444285, 1.16533196083455936609, 1.16610849088962420517, 1.1668859699830766985, 1.16766452659293729077, 1.16844415608910412452, 1.16922485847030332984, 1.17000651452850790157, 1.17078924347259771821, 1.17157304062713296666, 1.17235791533360300676, 1.1731438629276580432, 1.17393076419830322266, 1.1747187383542596617, 1.17550778539609557249, 1.17629790532381117707, 1.17708909341720890929, 1.17788135910901026193, 1.1786746976866855352, 1.17946910915025182653, 1.18026459349869727866, 1.18106115073344875022, 1.18185865688778712901, 1.18265735988804521206, 1.18345713577276190343, 1.18425798454364250567, 1.18505990620068679675, 1.18586301995147946897, 1.18666708258363251538, 1.1874722228916367861, 1.18827855529324732942, 1.18908596058088522618, 1.18989443875481759605, 1.19070398981463543286, 1.19151472813261372075, 1.19232654416580663437, 1.19313943308487924178, 1.19395339488983154297]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_DewPointTemperature.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_DewPointTemperature.txt
deleted file mode 100644
index 0fe7626e..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_DewPointTemperature.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1', 'linear': ' '}
-humRat.p=[101325., 101325.]
-time=[0., 1.]
-humRat.p_w=[15357.345703125, 15226.98144239673274569213, 15096.48241603757378470618, 14965.84862404752675502095, 14835.08006642613509029616, 14704.17579100705734163057, 14573.13670116503271856345, 14441.96191797348001273349, 14310.65134369202496600337, 14179.20414859186712419614, 14047.62111336521411431022, 13915.9013593315194157185, 13784.04488648641381587368, 13652.05169483426652732305, 13519.92188287897261034232, 13387.65437574622046668082, 13255.24897605714249948505, 13122.70607839775948377792, 12990.0254855638304434251, 12857.20602300164136977401, 12724.24906307829223806038, 12591.15225643140911415685, 12457.91795285701300599612, 12324.54400098277619690634, 12191.03020177237340249121, 12057.3779296875, 11923.58580982524654245935, 11789.65346406708704307675, 11655.5810706765296345111, 11521.36805199260743393097, 11387.0148086654044163879, 11252.51956332934059901163, 11117.88466926474029605743, 10983.10857523883714748081, 10848.19047795668666367419, 10713.12980226199215394445, 10577.92890442635871295352, 10442.58502550130651798099, 10307.09856816720275674015, 10171.46953242404561024159, 10035.6983231483718554955, 9899.78315448735884274356, 9763.7254074138018040685, 9627.5245115228808572283, 9491.17867840996041195467, 9354.6892903185016621137, 9218.05675468733716115821, 9081.27928055942538776435, 8944.3562983204101328738, 8807.28919327605035505258, 8670.0771484375, 8532.7195954857234028168, 8395.21555788886689697392, 8257.5669887439926242223, 8119.77275672985524579417, 7981.83121919411587441573, 7843.74319699972784292186, 7705.50869012803195801098, 7567.12721031468936416786, 7428.59826928445454541361, 7289.92318232775505748577, 7151.09931976244752149796, 7012.12750770016100432258, 6873.00774612110672023846, 6733.73954674403466924559, 6594.32242130166378046852, 6454.75769039112492464483, 6315.04271374015115725342, 6175.17881101572947954992, 6035.16500565902242669836, 5895.00129765380552271381, 5754.68817529056832427159, 5614.22501141316570283379, 5473.61061987199173017871, 5332.84534914284904516535, 5191.92919921875, 5050.86217006942842999706, 4909.64328516265231883153, 4768.27254449842075700872, 4626.75079208342594938586, 4485.07585255317735573044, 4343.24856898581310815644, 4201.26845307261464768089, 4059.13550482940854635672, 3916.84948011776441489928, 3774.41049599363486777293, 3631.81709859745205903891, 3489.06964817353264152189, 3346.16814470674307813169, 3203.11209991408668429358, 3059.90126967240075828158, 2916.53650896033514072769, 2773.0153763463199538819, 2629.33896999591297571897, 2485.5068016227696716669, 2341.51887121249228584929, 2197.37444636283998988802, 2053.07438763113987079123, 1908.6168527942991204327, 1764.00233523814699765353, 1619.23046875]
-humRat.X_w=[0.10000000149011611938, 0.0991000011362137001, 0.09820000078231128082, 0.09730000042840893093, 0.09640000007450645614, 0.09549999988824074693, 0.09459999936670161758, 0.09369999918043596387, 0.09279999865889708432, 0.09189999880790390707, 0.09099999828636512467, 0.09009999776482635614, 0.08919999724328757373, 0.08829999672174880521, 0.08739999687075783452, 0.08649999701978464128, 0.08560000327824533739, 0.08470000342726546894, 0.08380000357627229168, 0.08290000238417903622, 0.08200000253319474075, 0.08110000134111036707, 0.08020000149011718982, 0.07930000163912399869, 0.07840000044703963888, 0.07750000059604644775, 0.07659999940396207407, 0.07570000089406007937, 0.07479999970197570569, 0.07389999850989134589, 0.07299999999998933731, 0.0720999988079049775, 0.07119999761582060382, 0.07029999910591860912, 0.06939999791384755812, 0.06849999672174986176, 0.06759999821190115776, 0.06669999701978125695, 0.06580000327824196693, 0.06490000208612206611, 0.06400000357627336212, 0.06310000238417566576, 0.06219999746681432323, 0.06129999895692564427, 0.06040000149011381242, 0.05950000029801167517, 0.05860000178813187799, 0.05770000059604529774, 0.05679999940396314451, 0.05590000089406114286, 0.05499999970197677612, 0.05409999850990519776, 0.05319999731783361246, 0.0522999961257620341, 0.05140000029801522485, 0.05050000283119397693, 0.04960000163912878929, 0.04870000044703750447, 0.04779999925494816254, 0.04689999806290766349, 0.04600000223512089315, 0.04510000104304930785, 0.04419999985098661127, 0.04329999865890615113, 0.04239999746683457277, 0.04149999627476298747, 0.04060000417226651559, 0.03970000298019493029, 0.03880000178812335193, 0.0379000005960409489, 0.03699999940395799769, 0.03609999821190862379, 0.03520000238412184651, 0.03430000119208578835, 0.03339999999999644642, 0.03249999880790710449, 0.03159999761583552613, 0.03069999828639132997, 0.02979999709431086635, 0.02890000126657072191, 0.0280000019371243053, 0.02710000074505912113, 0.02619999955297449418, 0.02529999836089403056, 0.02439999716881357042, 0.02350000134107342251, 0.02260000201162478892, 0.02170000081955764798, 0.02079999962747718784, 0.01989999843539672422, 0.01899999724333846854, 0.01810000327819684049, 0.01720000208612526213, 0.01630000089406034164, 0.01539999970197460447, 0.01449999850990497767, 0.01359999824914153929, 0.01270000242140139311, 0.01180000216063462407, 0.01090000096855860308, 0.00999999977648258209]
-TDewPoi.T=[327.611572265625, 327.4344177206326094165, 327.2557983318151855201, 327.0756530640267101262, 326.89398191726377262967, 326.71072389065238894545, 326.52587888132529769791, 326.33941650948145252187, 326.15130611853788877852, 325.96151740208722458192, 325.77001955987628889488, 325.57678221497553749941, 325.38174433217420755682, 325.1849059114903752743, 324.98623658415272075217, 324.78570568636837379017, 324.58322136275108960035, 324.37881473396367937312, 324.17239394703909738382, 323.9639586902486598774, 323.75341803177786914603, 323.54080186169113630967, 323.32598874377441688921, 323.10900887997541985897, 322.88973987187296188495, 322.668182373046875, 322.44427468741241682437, 322.21795678689471742473, 321.98919680473767357398, 321.75790385855765407541, 321.52407864908252577152, 321.28759771285683655151, 321.04840070668467433279, 320.80648835585026290573, 320.56173714845846234311, 320.3140867654513499474, 320.06350744023728793763, 319.80987560978951478319, 319.55310046261024581327, 319.29318199826303725786, 319.02993790184666522691, 318.76336660317628002304, 318.49334681101100841261, 318.21975727674686140745, 317.94253533377934672899, 317.66155972098999882292, 317.37673974094963114112, 317.08795162543179912973, 316.79507414595053660378, 316.49801664234780673723, 316.19659423828125, 315.89071625849965130328, 315.58026063268619054725, 315.26501373823060703216, 314.94488594507413381507, 314.619690331572883224, 314.28924568477771117614, 313.95339941559041108121, 313.61193790104397294272, 313.26467803508523957134, 312.91140831870160354811, 312.55188040077916866721, 312.18591326164892052475, 311.81317120707836920701, 311.4335016478673878737, 311.04650785593673845142, 310.65197858190782653764, 310.24957343103176299337, 309.83895903632446788833, 309.41973866832137218807, 308.99154611372944145842, 308.55398464424223448077, 308.10659919170569764901, 307.64889614492096825416, 307.18038985539863006125, 306.700531005859375, 306.20867872308815549331, 305.70422265581345300234, 305.18646089711910462938, 304.65463372183376122848, 304.10784978028436853492, 303.54525770405774665051, 302.96581989046524086007, 302.36843770514212792477, 301.75192095911796741348, 301.11490022084342399467, 300.4558725378576014009, 299.77313265454165502888, 299.06484950805901235071, 298.3288868613927320439, 297.56280330370901765491, 296.76388762975722102055, 295.92901753195980063538, 295.0545050320034761171, 294.1361692078542660056, 293.16903567436219191222, 292.14721452757862607541, 291.06372387902672471682, 289.90997540324127612621, 288.6755383202193456782, 287.347320556640625]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_HumidityRatioPressure.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_HumidityRatioPressure.txt
deleted file mode 100644
index c75f47aa..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_HumidityRatioPressure.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-humRat.p=[101325., 101325.]
-time=[0., 1.]
-humRat.p_w=[24653.884765625, 24479.34179296300862915814, 24304.0019452652195468545, 24127.86131628099246881902, 23950.91209351050565601327, 23773.15040389343266724609, 23594.56833535954137914814, 23415.16406785656727151945, 23234.92770205759006785229, 23053.85748675079958047718, 22871.94533965672962949611, 22689.18553595119010424241, 22505.57221623735676985234, 22321.0975680399606062565, 22135.75977669258281821385, 21949.5489393246898544021, 21762.46087040299971704371, 21574.48831492597309988923, 21385.62708846452369471081, 21195.86714213071172707714, 21005.20513505488634109497, 20813.63463966213021194562, 20621.14646136323062819429, 20427.73640897585937636904, 20233.39637982144631678239, 20038.12109375, 19841.90215607956633903086, 19644.73458695694716880098, 19446.61135178869517403655, 19247.52327088440142688341, 19047.46508270360573078506, 18846.42973552355033461936, 18644.40805820218884036876, 18441.39479799188484321348, 18237.3828856040163373109, 18032.36315868819656316191, 17826.33037344679178204387, 17619.27548955454039969482, 17411.19130672906976542436, 17202.07001244244383997284, 16991.90246926874533528462, 16780.68351798473304370418, 16568.40401767320872750133, 16355.0548404065593786072, 16140.62885497264687728602, 15925.11790637770718603861, 15708.51482955434403265826, 15490.80954428092263697181, 15271.99390514638616878074, 15052.06075704613976995461, 14831., 14608.80252182284675654955, 14385.46148676030861679465, 14160.96615261091756110545, 13935.3110320742052863352, 13708.48171627039482700638, 13480.47271072492185339797, 13251.27424961583710683044, 13020.87559084083113702945, 12789.26892192738705489319, 12556.44489219541719648987, 12322.39291363992015249096, 12087.102651492186851101, 11850.56531654070749937091, 11612.77016656305931974202, 11373.70841258754262526054, 11133.36977228034993459005, 10891.74259161381451121997, 10648.81658037410488759633, 10404.58294939337611140218, 10159.02997976736151031218, 9912.14595290847137221135, 9663.92356327182096720207, 9414.34813330260112707037, 9163.40941951762943062931, 8911.0966796875, 8657.39819476419324928429, 8402.30419934622295841109, 8145.80102153064854064723, 7887.8794609078140638303, 7628.5247239170057582669, 7367.72613653667303879047, 7105.4714914820360718295, 6841.74858183451215154491, 6576.54568886552988260519, 6309.85122320746813784353, 6041.64931030502702924423, 5771.92932811976152152056, 5500.67760459390319738304, 5227.88193265429345046869, 4953.52815225527501752367, 4677.60521747643724665977, 4400.09616732498307101196, 4120.98896961960599583108, 3840.26946408855565096019, 3557.92397865910561449709, 3273.93810922220836800989, 2988.29940309898256600718, 2700.99005122158405356458, 2411.99661413717922187061, 2121.3046875]
-humRat.X_w=[0.16666667163372039795, 0.16536812481356366611, 0.1640655099762244884, 0.16275884202284915392, 0.16144807624996551643, 0.16013319800172129415, 0.15881419164101909236, 0.15749104324951140876, 0.15616372203889164472, 0.15483219969267994487, 0.15349648912807947743, 0.15215653173074022986, 0.15081232750055556524, 0.149463861536497572, 0.14811110504594521275, 0.14675404212400891546, 0.14539264093733728078, 0.14402689064159573951, 0.14265677431002088404, 0.14128226008959710036, 0.13990332227371299334, 0.13851995675287748222, 0.13713213784807931628, 0.13573983369821598921, 0.13434304221894574627, 0.13294170796871185303, 0.13153584167136772587, 0.13012540491950067012, 0.12871038930617262341, 0.1272907543233976202, 0.12586648932231991882, 0.1244375634624408089, 0.12300395862834564986, 0.12156564931179730804, 0.12012261949000074823, 0.11867483618818217006, 0.11722228884143182093, 0.11576493899072062832, 0.11430276860471763611, 0.11283575533162774895, 0.11136388121475791768, 0.10988710767756001974, 0.1084054167472116581, 0.10691879051110005083, 0.10542719030510278033, 0.10393060565045438015, 0.10242901122870330666, 0.10092236083630672094, 0.09941065148918212802, 0.09789385791429046357, 0.09637193381786346436, 0.09484486881004611236, 0.09331263308941811774, 0.0917752043041311083, 0.09023255441252225895, 0.08868465757364665802, 0.08713147826320920275, 0.08557299412847578501, 0.08400918281814626076, 0.08244000707955531637, 0.08086546141315086034, 0.07928548979583360801, 0.07770007924441342528, 0.07610919995587515918, 0.07451282212784314518, 0.07291091595840354378, 0.0713034686937255302, 0.06969042391939393732, 0.0680717688471438459, 0.06644746622378540357, 0.06481749369701639285, 0.06318182146511922004, 0.06154042952637295283, 0.05989326478731631098, 0.05824030348564860488, 0.05658152326941490173, 0.05491688688457536244, 0.05324636825505710963, 0.05156993012795716563, 0.04988755647248596659, 0.04819919370500043432, 0.04650482203288040101, 0.0448044042022008801, 0.04309791041115521026, 0.04138530713230518382, 0.03966657482668249635, 0.03794165947776209635, 0.03621053405813711573, 0.03447316876478351971, 0.03272953006998204073, 0.03097957885869523018, 0.02922329581604284424, 0.02746062461588202885, 0.02569154031631345689, 0.02391600938929659692, 0.02213399458124250957, 0.02034546236529993432, 0.0185503843449818899, 0.01674870559498346095, 0.01494040047228136631, 0.01312543172389268875]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_MassFraction_pTphi.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_MassFraction_pTphi.txt
deleted file mode 100644
index 36ff0ccc..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_MassFraction_pTphi.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-masFra1.phi=[0., 0.02000000000000000042, 0.04000000000000000083, 0.05999999999999999778, 0.08000000000000000167, 0.10000000000000000555, 0.11999999999999999556, 0.14000000000000001332, 0.16000000000000000333, 0.17999999999999999334, 0.2000000000000000111, 0.22000000000000000111, 0.23999999999999999112, 0.26000000000000000888, 0.28000000000000002665, 0.2999999999999999889, 0.32000000000000000666, 0.34000000000000002442, 0.35999999999999998668, 0.38000000000000000444, 0.4000000000000000222, 0.41999999999999998446, 0.44000000000000000222, 0.46000000000000001998, 0.47999999999999998224, 0.5, 0.52000000000000001776, 0.54000000000000003553, 0.56000000000000005329, 0.57999999999999996003, 0.5999999999999999778, 0.61999999999999999556, 0.64000000000000001332, 0.66000000000000003109, 0.68000000000000004885, 0.69999999999999995559, 0.71999999999999997335, 0.73999999999999999112, 0.76000000000000000888, 0.78000000000000002665, 0.80000000000000004441, 0.81999999999999995115, 0.83999999999999996891, 0.85999999999999998668, 0.88000000000000000444, 0.9000000000000000222, 0.92000000000000003997, 0.93999999999999994671, 0.95999999999999996447, 0.97999999999999998224, 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-time=[0., 1.]
-masFra2.X[1]=[0., 0.00015085668174639078, 0.00030174101213295795, 0.00045265304936733343, 0.00060359273524191728, 0.00075456009984177172, 0.00090555522753453879, 0.00105657800581949947, 0.00120762854721843341, 0.00135870668290341405, 0.0015098126379971689, 0.0016609464163646016, 0.00181210778517574525, 0.00196329697726046288, 0.00211451387994123418, 0.00226575848944139896, 0.00241703126402082044, 0.00256833128719439986, 0.00271965925001732296, 0.00287101537804238969, 0.0030223989873690931, 0.00317381052915507306, 0.0033252497849857645, 0.0034767167476357809, 0.00362821187569777222, 0.00377973448485136032, 0.00393128549233360929, 0.00408286352210656886, 0.0042344699433008821, 0.00438610430423155145, 0.00453776615286164385, 0.00468945639316427701, 0.00484117457320077087, 0.00499291977503059457, 0.00514469383444154851, 0.00529649583358580631, 0.00544832485427470658, 0.00560018273279287108, 0.00575206808538582855, 0.00590398184336949142, 0.00605592262256028982, 0.00620789225992007896, 0.00635988983701317283, 0.00651191443506304694, 0.00666396789153115687, 0.00681604928773479283, 0.00696815863596159882, 0.00712029591153913888, 0.00727246112685109476, 0.00742465429393919778, 0.00757687585428357124, 0.00767951096021468257, 0.00778337355165721091, 0.00788847666716050756, 0.00799483317304294436, 0.00810245597883537186, 0.00821135842426590039, 0.00832155261675680998, 0.00843305345738259125, 0.00854587305331528518, 0.00866002468988710111, 0.00877552276641916512, 0.00889238150779953287, 0.00901061395272410512, 0.00913023407107146738, 0.00925125676391399566, 0.00937369433568071425, 0.00949756314698731695, 0.00962287737365194289, 0.00974965098563623962, 0.0098778998156011117, 0.01000763690191544542, 0.01013887822159737113, 0.01027163930876437772, 0.01040593521842088191, 0.01054178085178136826, 0.01067919204167598786, 0.01081818462033982096, 0.01095877442029660753, 0.01110097549006069766, 0.01124480722012169594, 0.01139028366896143937, 0.01153742066935990393, 0.01168623684764334703, 0.01183674710495734653, 0.01198896729253146921, 0.01214291692009902661, 0.01229861091815724616, 0.01245606884468447237, 0.01261530466958593957, 0.01277633888183172563, 0.01293918633775186303, 0.01310386760493554778, 0.01327039941356991659, 0.01343879945892830462, 0.01360908636769729042, 0.01378127876610882666, 0.01395539330574860695, 0.01413145161963884865, 0.0143094713025748721, 0.01448947098106145859]
-masFra1.X[1]=[0., 0.00015085668174639078, 0.00030174101213295795, 0.00045265304936733343, 0.00060359273524191728, 0.00075456009984177172, 0.00090555522753453879, 0.00105657800581949947, 0.00120762854721843341, 0.00135870668290341405, 0.0015098126379971689, 0.0016609464163646016, 0.00181210778517574525, 0.00196329697726046288, 0.00211451387994123418, 0.00226575848944139896, 0.00241703126402082044, 0.00256833128719439986, 0.00271965925001732296, 0.00287101537804238969, 0.0030223989873690931, 0.00317381052915507306, 0.0033252497849857645, 0.0034767167476357809, 0.00362821187569777222, 0.00377973448485136032, 0.00393128549233360929, 0.00408286352210656886, 0.0042344699433008821, 0.00438610430423155145, 0.00453776615286164385, 0.00468945639316427701, 0.00484117457320077087, 0.00499291977503059457, 0.00514469383444154851, 0.00529649583358580631, 0.00544832485427470658, 0.00560018273279287108, 0.00575206808538582855, 0.00590398184336949142, 0.00605592262256028982, 0.00620789225992007896, 0.00635988983701317283, 0.00651191443506304694, 0.00666396789153115687, 0.00681604928773479283, 0.00696815863596159882, 0.00712029591153913888, 0.00727246112685109476, 0.00742465429393919778, 0.00757687585428357124, 0.00767951096021468257, 0.00778337355165721091, 0.00788847666716050756, 0.00799483317304294436, 0.00810245597883537186, 0.00821135842426590039, 0.00832155261675680998, 0.00843305345738259125, 0.00854587305331528518, 0.00866002468988710111, 0.00877552276641916512, 0.00889238150779953287, 0.00901061395272410512, 0.00913023407107146738, 0.00925125676391399566, 0.00937369433568071425, 0.00949756314698731695, 0.00962287737365194289, 0.00974965098563623962, 0.0098778998156011117, 0.01000763690191544542, 0.01013887822159737113, 0.01027163930876437772, 0.01040593521842088191, 0.01054178085178136826, 0.01067919204167598786, 0.01081818462033982096, 0.01095877442029660753, 0.01110097549006069766, 0.01124480722012169594, 0.01139028366896143937, 0.01153742066935990393, 0.01168623684764334703, 0.01183674710495734653, 0.01198896729253146921, 0.01214291692009902661, 0.01229861091815724616, 0.01245606884468447237, 0.01261530466958593957, 0.01277633888183172563, 0.01293918633775186303, 0.01310386760493554778, 0.01327039941356991659, 0.01343879945892830462, 0.01360908636769729042, 0.01378127876610882666, 0.01395539330574860695, 0.01413145161963884865, 0.0143094713025748721, 0.01448947098106145859]
-masFra1.T=[283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.149993896484375, 283.35000629428799356901, 283.54998817451348713803, 283.75000057231716255046, 283.95001177779340650886, 284.14999365801890007788, 284.35000605582109756142, 284.54998793604801221591, 284.75000033385168762834, 284.95001273125512852857, 285.14999341955342515575, 285.35000581735704372477, 285.54998769765529686993, 285.75000009538621270622, 285.95001249297155254681, 286.14999437341532484425, 286.35000557889156880265, 286.54998745937172088816, 286.74999985692073778409, 286.95001225468939765051, 287.14999413494984992212, 287.35000653275346849114, 287.54998722108814490639, 287.74999961845526286197, 287.95001201625888143099, 288.149993896484375, 288.35000629428799356901, 288.54998817451348713803, 288.75000057231716255046, 288.95001177779340650886, 289.14999365801890007788, 289.35000605582109756142, 289.54998793604801221591, 289.75000033385168762834, 289.95001273125512852857, 290.14999341955342515575, 290.35000581735704372477, 290.54998769765529686993, 290.75000009538621270622, 290.95001249297155254681, 291.14999437341532484425, 291.35000557889156880265, 291.54998745937172088816, 291.74999985692073778409, 291.95001225468939765051, 292.14999413494984992212, 292.35000653275346849114, 292.54998722108814490639, 292.74999961845526286197, 292.95001201625888143099, 293.149993896484375]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_Phi_pTX.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_Phi_pTX.txt
new file mode 100644
index 00000000..ae9a7ed1
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_Phi_pTX.txt
@@ -0,0 +1,4 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+phi.phi=[0., 0.0107401677013480041, 0.02147668089275001427, 0.03220954236817245853, 0.0429387511962958171, 0.0536643109676165006, 0.06438622767444500405, 0.07510448960313732825, 0.08581911964042598928, 0.0965300983633336912, 0.10723744918318590946, 0.11794115666756081751, 0.12864123571754632058, 0.13933766398155389421, 0.1500304632966913132, 0.160719641633175786, 0.17140520001052308996, 0.18208710658303617347, 0.19276539217700286444, 0.20344007269680214334, 0.21411111632898219281, 0.22477856977683610684, 0.23544237144727828137, 0.24610256704026869934, 0.25675917243294582581, 0.26741212606430053711, 0.27806151928630457038, 0.28870724489701699023, 0.29934939615240713229, 0.30998794131934537255, 0.32062287851161114238, 0.33125421151402689723, 0.34188196823040212236, 0.35250608720204096302, 0.36312666155607392637, 0.37374362982202807837, 0.38435696037506039691, 0.39496674627863687101, 0.40557295589635028454, 0.41617555942587841633, 0.42677455508855860478, 0.43737000605817338839, 0.44796185093951407241, 0.45855011778821475055, 0.46913481010973101526, 0.47971595594752902691, 0.49029346417992786256, 0.50086742765570335667, 0.51143784464792052535, 0.52200471347284516099, 0.5325679779052734375, 0.53871834869239820787, 0.54494918590401275615, 0.5512615028241941717, 0.55765663198066917072, 0.56413566289831251765, 0.57069992861780716176, 0.57735062124945513151, 0.58408899248617984767, 0.59091635362872096948, 0.59783391486655190761, 0.60484312956899100033, 0.61194526808756755099, 0.61914170134246948596, 0.62643391945365289875, 0.63382317411439503818, 0.64131097011469528901, 0.64889876761519593718, 0.65658807201624236338, 0.66438037344338873869, 0.67227722163208192274, 0.68028010668837701758, 0.68839064887873446796, 0.69661043498278407693, 0.70494114553908837628, 0.71338444948196411133, 0.7219419561641047256, 0.73061539410315579079, 0.73940655144442923863, 0.74831710323607436575, 0.75734900345729128102, 0.76650398750189219221, 0.77578390313772194187, 0.7851906577073910487, 0.79472615855888717462, 0.8043923742318895842, 0.81419126770184091502, 0.8241249275265782881, 0.83419538028391904128, 0.84440465253818020042, 0.854754890050179017, 0.86524823521104055057, 0.87588695886625012044, 0.88667326389853318158, 0.89760935569453259575, 0.90869755885619152291, 0.91994025755504116315, 0.93133970795820264499, 0.94289848971803857935, 0.95461903878648102229, 0.96650385856628417969]
+time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_SaturationPressure.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_SaturationPressure.txt
deleted file mode 100644
index 875f5fff..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_SaturationPressure.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-last-generated=2016-03-15
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-pSat.pSat=[0.03226286172866821289, 0.04391229183526846463, 0.05942531384464858762, 0.07996996654324539655, 0.10703303203846113723, 0.14249755148923753945, 0.18873680361483016754, 0.24872775178180830946, 0.32618738828011240027, 0.42573582184256281158, 0.55309078990484983329, 0.71529812733917330636, 0.92100441832518531449, 1.18077781088271316356, 1.50748417633728681864, 1.91672739593654650747, 2.42736169615216645923, 3.06208264400970131547, 3.84811817124794774969, 4.81801869789914505304, 6.01056108114700293754, 7.47180092941570794807, 9.25624489852438436799, 11.4282178634531366157, 14.06339517581077025454, 17.2505207061767578125, 21.09339932243427995218, 25.71305124001207786932, 31.25026441315944225607, 37.86827700494661286257, 45.75589889820587075064, 55.13102101618490280543, 66.2443401426994000758, 79.38360282409212231869, 94.87846546514558099261, 113.10542729499714198482, 134.4936045189320168447, 159.53120678655639608223, 188.77204896535656075685, 222.84326926252947487228, 262.45334410042221406911, 308.40150718817307051722, 361.58671540888695972171, 423.01856923603878612994, 493.82918095162233385054, 575.46727026821577055671, 661.77318330114815125853, 754.45209923575509947113, 858.40710174915682273422, 974.79486689146358457947, 1104.8685302734375, 1249.98122669797612616094, 1411.59334600696411143872, 1591.27850129961007041857, 1790.72794770654127205489, 2011.76242098516650003148, 2256.33148229666994666331, 2526.52461900703929131851, 2824.57743134551583352732, 3152.87859703372851072345, 3513.97395980450619390467, 3910.5841281580028407916, 4345.59841771438641444547, 4822.08959521622637112159, 5343.32158695204270770773, 5912.75680146459762909217, 6534.05788408839271141915, 7211.11357732466058223508, 7948.0243574175128742354, 8749.1232475298638746608, 9618.98058079784641449805, 10562.41520976055835490115, 11584.49307598066297941841, 12690.56130034062334743794, 13886.22050393593417538796, 15177.357421875, 16570.14592034067391068675, 18071.05572644027051865123, 19686.86225071943772491068, 21424.64069397491766721942, 23291.82192905072588473558, 25296.13232109529781155288, 27445.64808674423329648562, 29748.78720705510568222962, 32214.32313823851654888131, 34851.37245015179360052571, 37669.47242428475146880373, 40678.48290264118259074166, 43888.66955922645865939558, 47310.6847713734969147481, 50955.5832394808967364952, 54834.80207322401111014187, 58960.2546645433030789718, 63344.20772579070035135373, 67999.38396256777923554182, 72938.93578625575173646212, 78176.44132247427478432655, 83725.90563114661199506372, 89601.87916180523461662233, 95819.26737450639484450221, 102393.4765625]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_SaturationPressureLiquid.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_SaturationPressureLiquid.txt
deleted file mode 100644
index 99eef7b0..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_SaturationPressureLiquid.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-pSat.pSat=[611.12640380859375, 657.06359969956770328281, 706.02624739045097612689, 758.18402462729966373445, 813.71442165686596581509, 872.80285193342376715009, 935.6429530771805502809, 1002.43700967950485392066, 1073.39613131652981792286, 1148.74032885340920984163, 1228.69920655169994461176, 1313.51196812592047535873, 1403.42763727354054026364, 1498.7058575692565227655, 1599.61632685480230975372, 1706.43999835359954886371, 1819.46928008241502539022, 1939.00718029452468726959, 2065.36953651647309015971, 2198.88382195296298959875, 2339.88960549670446198434, 2488.74082344079170070472, 2645.8022654240385236335, 2811.45427511549269183888, 2986.09042869993618296576, 3170.117431640625, 3363.95844261076808834332, 3568.04933706745441668318, 3782.84396801155071443645, 4008.80952050139467246481, 4246.42939853738425881602, 4496.2055056666786185815, 4758.65400191671596985543, 5034.30822518391323683318, 5323.72206244953486020677, 5627.46356522859423421323, 5946.12062916649574617622, 6280.30110715083174000029, 6630.63005461671946250135, 6997.7520048467677042936, 7382.33130948228881607065, 7785.05483552847454120638, 8206.62752117765012371819, 8647.77409280226493137889, 9109.24620675994447083212, 9591.81113764081601402722, 10096.2612903378285409417, 10623.4131504460074211238, 11174.10314544481661869213, 11749.19182485361852741335, 12349.5654296875, 12976.1334254116372903809, 13629.82940364699788915459, 14311.61137500000222644303, 15022.45938673796081275214, 15763.39265680296739446931, 16535.44317227338251541369, 17339.67246437052745022811, 18177.17330683299587690271, 19049.06288886715628905222, 19956.47827077279725926928, 20900.60604989243438467383, 21882.64210249264215235598, 22903.81885776383933261968, 23965.39608529839097172953, 25068.66480073527054628357, 26214.93835409216626430862, 27405.58196713884535711259, 28641.96980548027931945398, 29925.51789104874842450954, 31257.67154542215575929731, 32639.90537555877745035104, 34073.72240028497617458925, 35560.68462263447872828692, 37102.35788354939722921699, 38700.35546875, 40356.31411307927191955969, 42071.91740436410327674821, 43848.87628507767658447847, 45688.92959036936372285709, 47593.88051019316480960697, 49565.53467970008205156773, 51605.75539552133705001324, 53716.42937571243965066969, 55899.48631009256496326998, 58156.87345223792362958193, 60490.62942970496078487486, 62902.77227213716105325148, 65395.3879307619936298579, 67970.59750597899255808443, 70630.53771522501483559608, 73377.41457854642067104578, 76213.47176897073222789913, 79140.97444208204979076982, 82162.24292149406392127275, 85279.6287861346936551854, 88495.52265453172731213272, 91812.33414349574013613164, 95232.5949589386727893725, 98758.78565872261242475361, 102393.4765625]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_SublimationPressureIce.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_SublimationPressureIce.txt
deleted file mode 100644
index c43d56b7..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_SublimationPressureIce.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-pSat.pSat=[0.03226286172866821289, 0.03713640209892941219, 0.0426947141889049836, 0.04902665362916580616, 0.0562316335239928522, 0.06442075158569471327, 0.07371803507499841146, 0.08426179703837222146, 0.09620612344595502741, 0.10972249000448337786, 0.12500154733161347731, 0.14225503912802436868, 0.16171791220026071612, 0.18365057935180431614, 0.20834143305609448271, 0.23610956723623169329, 0.26730771068000147572, 0.30232527196789238388, 0.34159195465330594033, 0.38558153439714576427, 0.43481548086836158129, 0.48986793440424664103, 0.55136979409107855776, 0.620014279976345839, 0.69656227438740003777, 0.78184771537780761719, 0.87678483835239617861, 0.98237389434001953781, 1.09971009226872395992, 1.22998952511168346824, 1.37451833419535174308, 1.53472324208311294846, 1.7121588147920587808, 1.90851864242864954768, 2.12564841774447987888, 2.36555448443585181195, 2.63041790666364017071, 2.92261085332604375608, 3.24470536291268008, 3.59949308735706630102, 3.98999905254775244501, 4.41950337449521768463, 4.89155453343912771658, 5.40998944905150658258, 5.97896208792581607128, 6.60295469653851796465, 7.28680694542476459219, 8.03574666862815512047, 8.8554029205351358911, 9.75184352045923574792, 10.731609344482421875, 11.80173123130406231951, 12.96977659282704387067, 14.24387552689547042917, 15.63275791814853121764, 17.14581875196994076305, 18.79311330233782584287, 20.58543340038559676941, 22.5343471378013120443, 24.6522427737685418947, 26.95236783903732913359, 29.44894231032472120546, 32.15712223215889054018, 35.09312967308202502181, 38.27428150590019839683, 41.71907523032291464915, 45.44722120511666219045, 49.47980568003752210871, 53.83923781224518734234, 58.54941676419786489305, 63.6357904955847075712, 69.12544720077001159098, 75.04714745990067115144, 81.43159756264637394452, 88.31132594502356880639, 95.72089385986328125, 103.69702180182875395076, 112.27867310094174513324, 121.50715342175584510187, 131.42621711370125581197, 142.08241491029846770289, 153.52485376133731165282, 165.80559692917580605354, 178.97975925133258101596, 193.10559891642446928017, 208.24468336205100627012, 224.46230221035119711814, 241.82718570677963043636, 260.4119965313914235594, 280.29342559964521797156, 301.55245142525598112115, 324.27420029488234831661, 348.54900016174190113816, 374.47153858797020120619, 402.14166945573464317931, 431.66458735741531427266, 463.15104065721726556148, 496.71727821324850538076, 532.4862581634862408464, 570.58651059725286813773, 611.153564453125]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_TWetBul_TDryBulPhi.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_TWetBul_TDryBulPhi.txt
deleted file mode 100644
index 18d2f9d8..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_TWetBul_TDryBulPhi.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-last-generated=2016-05-24
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 1",
- "linear": " "
-}
-wetBulPhiApp.TWetBul=[283.175872802734375, 283.36437987943259031454, 283.03976439146617849474, 282.97467042320181462856, 283.24728396684258768801, 283.61788937551136768889, 284.0124512251213673153, 284.40786741992178576766, 284.79592902337196846929, 285.17346178069448114911, 285.53952020982990234188, 285.89395143673385746297, 286.23712167231661851474, 286.56948868095025773073, 286.89166257868424736444, 287.20419293115304526509, 287.50772105394912614429, 287.80276484040962259314, 288.089874064470166104, 288.36953741918102878117, 288.64224235115051442335, 288.90835588496668151492, 289.16833499149646513615, 289.42251576396688506065, 289.6712342626448730698, 289.914825439453125, 290.1535951956752796832, 290.38778661574230000042, 290.61764523645985036637, 290.84344501062838617145, 291.06536838968219171875, 291.28366083697630983806, 291.49847427334287885969, 291.7099911795563684791, 291.9184264395664172298, 292.12387097102669031301, 292.3264767624356181841, 292.5264281277779332413, 292.72381601139187523586, 292.91876248380810920935, 293.111389045923942831, 293.30181891532254212507, 293.49014306757402437142, 293.67642198642744233439, 293.86077885228576178633, 294.04330465981865927461, 294.22409042592363448421, 294.40316774583692449596, 294.58062763097814240609, 294.75656111209571008658, 294.930999755859375, 295.10403458797094344845, 295.27569612673863730379, 295.44607592446027410915, 295.61517297805289672397, 295.78311137254394225238, 295.94989009706426941193, 296.11553966886805255854, 296.2801516409407440733, 296.44375653089815614294, 296.60638389063313979932, 296.76806617553330625014, 296.92886344884885829742, 297.08877571079807466958, 297.24786399653726221004, 297.40615882342626719037, 297.56368977337086789703, 297.72048924067792086134, 297.8765562850549599716, 298.0319824588373194274, 298.1867372446254762508, 298.34088167736069863167, 298.49438432732875980946, 298.64733857586310250554, 298.79974350726359944019, 298.95159912109375, 299.10296645265526649382, 299.25381498451554307394, 299.40420575183088658378, 299.55416837965276499745, 299.70367413833020009406, 299.85275265003974709543, 300.0014649499407823896, 300.14978052045205458853, 300.29772987955294638596, 300.44534266579154291321, 300.5925901216141369332, 300.73956291821497188721, 300.88620002101987438436, 301.03253194738874753966, 301.17861973255048724241, 301.32443199088368146477, 301.46997046043952650507, 301.61529530625733741545, 301.76037601112375341472, 301.90524309254107038214, 302.04989655062149722653, 302.19436604210176255947, 302.33865328942658834421, 302.48275743099162582439, 302.626678466796875]
-wetBulPhi.TWetBul=[283.41241455078125, 283.68728638306151879078, 283.95962525624145200709, 284.22943117034151327971, 284.49682619564009655733, 284.76174924791030207416, 285.0243225447788972815, 285.28451537313321750844, 285.54238896188132912357, 285.79797354173587109472, 286.05130001122057592511, 286.3023986965289964246, 286.55133063283108185715, 286.79809582012217106239, 287.04272459484133150909, 287.28524765867069845626, 287.52572640392446601254, 287.76412959618949116702, 288.00057966536439835181, 288.23501592472882748552, 288.46749871022086608718, 288.69805923249776924422, 288.92672732204295016345, 289.15353384119606516833, 289.3784791239866081014, 289.60162353515625, 289.8229677392806138414, 290.0425412689842232794, 290.26037595067833763096, 290.47647112679953806946, 290.690887196331971154, 290.90365595529158326826, 291.11474624403462030386, 291.32421847607895415422, 291.5320739005039172298, 291.73834240757400948496, 291.94308442474050480087, 292.1462706553285784139, 292.34793100388179709626, 292.54809598819645088952, 292.74676501866656508355, 292.94400031431706565854, 293.13977076352551875971, 293.3341368242839166669, 293.52709965517703949445, 293.71865867463884569588, 293.90887435344882305799, 294.0977173075843325023, 294.28524800311083708948, 294.47146588735665773129, 294.656402587890625, 294.84002702979773857805, 295.02240024867347756299, 295.20352224451778511138, 295.38339194927465314322, 295.56207254145186880123, 295.73953242850200240355, 295.91583264503941563817, 296.09094267388223897797, 296.26489303231898020385, 296.43768269474787757645, 296.60937475487713754774, 296.77993766301506184391, 296.94937141843411154696, 297.11773705650881538531, 297.28503457694807821099, 297.4512629927486386805, 297.61645480309846334421, 297.78057849617670171938, 297.9436951071043608863, 298.10580463580521382028, 298.26690708239186733408, 298.42700149605707338196, 298.58612030279402915767, 298.74429306242637949254, 298.9014892578125, 299.0577394063850533712, 299.21307402557658861042, 299.36746259824559501794, 299.52096524744968064624, 299.6735227678685760111, 299.8252257939889204863, 299.97604380856319039594, 300.125976811806481237, 300.27502480382895555522, 300.42324793850144715179, 300.5706174653641369332, 300.71713249865689476792, 300.86285407317217277523, 301.00775167133195964198, 301.15182529349988271861, 301.29510460550864081597, 301.43759131539667350808, 301.57931508437638967735, 301.72024539479798477259, 301.86038224669471219386, 301.99981719247665523653, 302.13845785600221915956, 302.27636692498788306693, 302.41354357064341229488, 302.54998779296875]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_TWetBul_TDryBulXi.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_TWetBul_TDryBulXi.txt
deleted file mode 100644
index ca53696b..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_TWetBul_TDryBulXi.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-last-generated=2016-05-24
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1",
- "linear": " "
-}
-wetBul.TWetBul=[298.0599365234375, 298.05923461912357197434, 298.05853271481646515895, 298.05783081050594773842, 298.05712890619543031789, 298.05642700200996841886, 298.05572509757439547684, 298.05502319338211236754, 298.05432128892607579473, 298.05361938503847341053, 298.05291748055969947018, 298.05218505855737021193, 298.0514831540922386921, 298.05075073213083669543, 298.05004882817047473509, 298.04931640670474735089, 298.04861450168027658947, 298.04788208021454920527, 298.04714965874882182106, 298.04641723618260584772, 298.04568481468049867544, 298.04498290965602791402, 298.04425048819030052982, 298.04348754914644814562, 298.04275512662570690736, 298.042022705078125, 298.04129028247552923858, 298.04055786198296118528, 298.03979492196594947018, 298.03906249936335370876, 298.03829956145636970177, 298.03756713885377394035, 298.03680419867305317894, 298.03607177814410533756, 298.03530883816347341053, 298.03454589798275264911, 298.03378296007576864213, 298.03302001989504788071, 298.03225707971432711929, 298.03149413953360635787, 298.03073120162662235089, 298.02996826144590158947, 298.02920532126518082805, 298.02844238335819682106, 298.02764892559935105965, 298.02688598541863029823, 298.02609253006085054949, 298.02532958975280052982, 298.0245361319939547684, 298.02377319408697076142, 298.022979736328125, 298.02218627856927923858, 298.02139282081043347716, 298.02062988019321210231, 298.01983642741834046319, 298.01904296965949470177, 298.01824951190064894035, 298.01745605403266381472, 298.01663207880483241752, 298.01583862104604349952, 298.01504516783455756013, 298.01422119271592237055, 298.01342773473879788071, 298.01263427690719254315, 298.01181030164298135787, 298.01098632630606743987, 298.01019287309458150048, 298.00936889775766758248, 298.00854492252983618528, 298.00775146462547127157, 298.00692748914298135787, 298.00610351366054828759, 298.00527954319835544084, 298.00445556786144152284, 298.0036010750918649137, 298.002777099609375, 298.00195312427240423858, 298.00112914864445201601, 298.00027465602039455916, 297.99945068523084046319, 297.99859619249764364213, 297.99777221697877394035, 297.99691772406367817894, 297.99606323114858241752, 297.99523925541149083074, 297.99438476780773044084, 297.99353027474717237055, 297.99267578168655745685, 297.99182128869870211929, 297.99096679578360635787, 297.99011230250476955916, 297.98925781450083150048, 297.98840332158579258248, 297.98751831120171118528, 297.98666381814109627157, 297.98580932508048135787, 297.98492431444179828759, 297.98406982640148044084, 297.98318481619929798399, 297.9822998055606149137, 297.9814453125]
-wetBulApp.TWetBul=[298.18353271484375, 298.19006347671256662579, 298.19671630889388325159, 298.20346069381980669277, 298.2102966314732839237, 298.21722412058215923025, 298.22424316502429064712, 298.23135375955189374508, 298.2385559094855125295, 298.245788571653974941, 298.25311279187735635787, 298.26052856488968245685, 298.26797485552106081741, 298.27548218129959423095, 298.28305053665462764911, 298.29064940951502649114, 298.29830932890035910532, 298.30599975446784810629, 298.31372069755889242515, 298.32147216982411919162, 298.32928466564953851048, 298.33709717307101527695, 298.34490966891462448984, 298.35278319981443928555, 298.36065674245583068114, 298.3685302734375, 298.37640381616074591875, 298.38427733540083863772, 298.39218139553850051016, 298.40005493826174642891, 298.40792845752002904192, 298.41580200009775580838, 298.42367554267548257485, 298.43151854428288061172, 298.43933105190444621257, 298.44714355932592297904, 298.4549255259771598503, 298.46267699824238661677, 298.47039795285672880709, 298.47808838982018642128, 298.48571776889002649114, 298.49334717069723410532, 298.5009155373481917195, 298.50845336379279615358, 298.51596069514198461547, 298.52340699115302413702, 298.53079223021632060409, 298.5381469735293649137, 298.545440681522450177, 298.55267333285883069038, 298.559844970703125, 298.56695557310001731821, 298.57400514034065963642, 298.58099367242505195463, 298.58792112784453820495, 298.59478758947091137088, 298.60156249839928932488, 298.60830688945856081773, 298.61492921016889567909, 298.62152101290092787167, 298.62799070737702322731, 298.63439940511324266481, 298.6407470673294142216, 298.6470031768112107784, 298.65316773334035360676, 298.65927125442226497398, 298.66528318711817746589, 298.67117308602627190339, 298.67703246655588600333, 298.68276977673667715862, 298.68841553389199816593, 298.6939697383493239613, 298.69943235733109077046, 298.7048034566107048704, 298.71008300286490566577, 298.71527099609375, 298.72033691886457518194, 298.7253418061880552159, 298.73022462334461124556, 298.73501585899083465847, 298.7396850531368954762, 298.74429321179923135787, 298.74877930003998471875, 298.75314331793185829156, 298.75744629986712652681, 298.76159666986512775111, 298.76568602926283801935, 298.76965331842080786373, 298.77349853697518256013, 298.77725220250420079537, 298.78088379779347860676, 298.78442381892108414831, 298.78787230859609280742, 298.79116821059875519495, 298.79440307689947076142, 298.79748535520042196367, 298.80050659801770507329, 298.80337523584614700667, 298.80615233851142420463, 298.8088073705731062546, 298.811370849609375]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_TotalAirDryAir.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_TotalAirDryAir.txt
deleted file mode 100644
index af22a543..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Examples_TotalAirDryAir.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-toDryAir.XiTotalAir=[0.09090909361839294434, 0.09016468374255665053, 0.0894190519714491705, 0.08867219830506806177, 0.08792411529283340743, 0.08717480307443635501, 0.0864242612308038366, 0.08567249032116679153, 0.08491947488419288037, 0.08416521576216541567, 0.08340971928178841921, 0.08265297110334045294, 0.0818949712267848795, 0.08113571220159772335, 0.08037520949608091547, 0.07961344019309721243, 0.07885040315492342078, 0.07808610810604105223, 0.07732053900914226396, 0.07655369472084176674, 0.07578558497685203288, 0.07501618513632926644, 0.07424551239353789633, 0.07347355070157780832, 0.0727002989073781275, 0.07192575186491012573, 0.07114991471613912877, 0.07037278348194062061, 0.06959434607970196862, 0.06881459737257376863, 0.06803355459161319896, 0.06725119072982506385, 0.06646751556315180776, 0.06568251653206992613, 0.06489620385891946286, 0.06410856497975821189, 0.06331959479737163388, 0.06252929606000913465, 0.06173765994075607055, 0.06094469016487610163, 0.06015037792613801143, 0.05935471848971887038, 0.05855771049546278084, 0.05775935259979165376, 0.05695963631855821552, 0.05615856402887613869, 0.05535613067399178244, 0.05455233147089197376, 0.0537471613581157262, 0.05294061901650536778, 0.0521326996386051178, 0.05132340190042825739, 0.05051272207688617399, 0.04970065271745156138, 0.04888719867491594234, 0.04807234652685685172, 0.04725609739227715905, 0.04643844754565599336, 0.04561939326186256055, 0.04479892709038151705, 0.04397705765943150241, 0.04315376772117710674, 0.04232905471933756658, 0.04150292237903442649, 0.04067536324968708955, 0.03984637360612959534, 0.03901595467706938519, 0.03818409283803571308, 0.03735078930893431792, 0.03651604036435795314, 0.03567984600417786062, 0.03484219505271850259, 0.03400309251575903136, 0.03316252839067017344, 0.03232049649845042394, 0.03147699683904647827, 0.03063202754953786577, 0.02978558117960155086, 0.02893765586659238775, 0.02808825109001776565, 0.02723735486146829782, 0.02638496851396338397, 0.02553108459668443353, 0.02467570310976506878, 0.02381881846535705352, 0.02296043205912476348, 0.02210052993308101593, 0.02123911161101258924, 0.0203761752301055768, 0.01951171520241121171, 0.01864572966542644983, 0.01777821634394980907, 0.0169091630339813434, 0.01603857117619533063, 0.01516643704519870031, 0.01429275412160213587, 0.01341751961163247485, 0.0125407350206440428, 0.01166238524030487229, 0.01078247176637869495, 0.00990098994225263596]
-toTotalAir.XiDry=[0.10000000149011611938, 0.0991000011362137001, 0.09820000078231128082, 0.09730000042840893093, 0.09640000007450645614, 0.09549999988824074693, 0.09459999936670161758, 0.09369999918043596387, 0.09279999865889708432, 0.09189999880790390707, 0.09099999828636512467, 0.09009999776482635614, 0.08919999724328757373, 0.08829999672174880521, 0.08739999687075783452, 0.08649999701978464128, 0.08560000327824533739, 0.08470000342726546894, 0.08380000357627229168, 0.08290000238417903622, 0.08200000253319474075, 0.08110000134111036707, 0.08020000149011718982, 0.07930000163912399869, 0.07840000044703963888, 0.07750000059604644775, 0.07659999940396207407, 0.07570000089406007937, 0.07479999970197570569, 0.07389999850989134589, 0.07299999999998933731, 0.0720999988079049775, 0.07119999761582060382, 0.07029999910591860912, 0.06939999791384755812, 0.06849999672174986176, 0.06759999821190115776, 0.06669999701978125695, 0.06580000327824196693, 0.06490000208612206611, 0.06400000357627336212, 0.06310000238417566576, 0.06219999746681432323, 0.06129999895692564427, 0.06040000149011381242, 0.05950000029801167517, 0.05860000178813187799, 0.05770000059604529774, 0.05679999940396314451, 0.05590000089406114286, 0.05499999970197677612, 0.05409999850990519776, 0.05319999731783361246, 0.0522999961257620341, 0.05140000029801522485, 0.05050000283119397693, 0.04960000163912878929, 0.04870000044703750447, 0.04779999925494816254, 0.04689999806290766349, 0.04600000223512089315, 0.04510000104304930785, 0.04419999985098661127, 0.04329999865890615113, 0.04239999746683457277, 0.04149999627476298747, 0.04060000417226651559, 0.03970000298019493029, 0.03880000178812335193, 0.0379000005960409489, 0.03699999940395799769, 0.03609999821190862379, 0.03520000238412184651, 0.03430000119208578835, 0.03339999999999644642, 0.03249999880790710449, 0.03159999761583552613, 0.03069999828639132997, 0.02979999709431086635, 0.02890000126657072191, 0.0280000019371243053, 0.02710000074505912113, 0.02619999955297449418, 0.02529999836089403056, 0.02439999716881357042, 0.02350000134107342251, 0.02260000201162478892, 0.02170000081955764798, 0.02079999962747718784, 0.01989999843539672422, 0.01899999724333846854, 0.01810000327819684049, 0.01720000208612526213, 0.01630000089406034164, 0.01539999970197460447, 0.01449999850990497767, 0.01359999824914153929, 0.01270000242140139311, 0.01180000216063462407, 0.01090000096855860308, 0.00999999977648258209]
-toDryAir.XiDry=[0.10000000149011611938, 0.0991000011362137001, 0.09820000078231128082, 0.09730000042840893093, 0.09640000007450645614, 0.09549999988824074693, 0.09459999936670161758, 0.09369999918043596387, 0.09279999865889708432, 0.09189999880790390707, 0.09099999828636512467, 0.09009999776482635614, 0.08919999724328757373, 0.08829999672174880521, 0.08739999687075783452, 0.08649999701978464128, 0.08560000327824533739, 0.08470000342726546894, 0.08380000357627229168, 0.08290000238417903622, 0.08200000253319474075, 0.08110000134111036707, 0.08020000149011718982, 0.07930000163912399869, 0.07840000044703963888, 0.07750000059604644775, 0.07659999940396207407, 0.07570000089406007937, 0.07479999970197570569, 0.07389999850989134589, 0.07299999999998933731, 0.0720999988079049775, 0.07119999761582060382, 0.07029999910591860912, 0.06939999791384755812, 0.06849999672174986176, 0.06759999821190115776, 0.06669999701978125695, 0.06580000327824196693, 0.06490000208612206611, 0.06400000357627336212, 0.06310000238417566576, 0.06219999746681432323, 0.06129999895692564427, 0.06040000149011381242, 0.05950000029801167517, 0.05860000178813187799, 0.05770000059604529774, 0.05679999940396314451, 0.05590000089406114286, 0.05499999970197677612, 0.05409999850990519776, 0.05319999731783361246, 0.0522999961257620341, 0.05140000029801522485, 0.05050000283119397693, 0.04960000163912878929, 0.04870000044703750447, 0.04779999925494816254, 0.04689999806290766349, 0.04600000223512089315, 0.04510000104304930785, 0.04419999985098661127, 0.04329999865890615113, 0.04239999746683457277, 0.04149999627476298747, 0.04060000417226651559, 0.03970000298019493029, 0.03880000178812335193, 0.0379000005960409489, 0.03699999940395799769, 0.03609999821190862379, 0.03520000238412184651, 0.03430000119208578835, 0.03339999999999644642, 0.03249999880790710449, 0.03159999761583552613, 0.03069999828639132997, 0.02979999709431086635, 0.02890000126657072191, 0.0280000019371243053, 0.02710000074505912113, 0.02619999955297449418, 0.02529999836089403056, 0.02439999716881357042, 0.02350000134107342251, 0.02260000201162478892, 0.02170000081955764798, 0.02079999962747718784, 0.01989999843539672422, 0.01899999724333846854, 0.01810000327819684049, 0.01720000208612526213, 0.01630000089406034164, 0.01539999970197460447, 0.01449999850990497767, 0.01359999824914153929, 0.01270000242140139311, 0.01180000216063462407, 0.01090000096855860308, 0.00999999977648258209]
-toTotalAir.XiTotalAir=[0.09090909361839294434, 0.09016468374255665053, 0.0894190519714491705, 0.08867219830506806177, 0.08792411529283340743, 0.08717480307443635501, 0.0864242612308038366, 0.08567249032116679153, 0.08491947488419288037, 0.08416521576216541567, 0.08340971928178841921, 0.08265297110334045294, 0.0818949712267848795, 0.08113571220159772335, 0.08037520949608091547, 0.07961344019309721243, 0.07885040315492342078, 0.07808610810604105223, 0.07732053900914226396, 0.07655369472084176674, 0.07578558497685203288, 0.07501618513632926644, 0.07424551239353789633, 0.07347355070157780832, 0.0727002989073781275, 0.07192575186491012573, 0.07114991471613912877, 0.07037278348194062061, 0.06959434607970196862, 0.06881459737257376863, 0.06803355459161319896, 0.06725119072982506385, 0.06646751556315180776, 0.06568251653206992613, 0.06489620385891946286, 0.06410856497975821189, 0.06331959479737163388, 0.06252929606000913465, 0.06173765994075607055, 0.06094469016487610163, 0.06015037792613801143, 0.05935471848971887038, 0.05855771049546278084, 0.05775935259979165376, 0.05695963631855821552, 0.05615856402887613869, 0.05535613067399178244, 0.05455233147089197376, 0.0537471613581157262, 0.05294061901650536778, 0.0521326996386051178, 0.05132340190042825739, 0.05051272207688617399, 0.04970065271745156138, 0.04888719867491594234, 0.04807234652685685172, 0.04725609739227715905, 0.04643844754565599336, 0.04561939326186256055, 0.04479892709038151705, 0.04397705765943150241, 0.04315376772117710674, 0.04232905471933756658, 0.04150292237903442649, 0.04067536324968708955, 0.03984637360612959534, 0.03901595467706938519, 0.03818409283803571308, 0.03735078930893431792, 0.03651604036435795314, 0.03567984600417786062, 0.03484219505271850259, 0.03400309251575903136, 0.03316252839067017344, 0.03232049649845042394, 0.03147699683904647827, 0.03063202754953786577, 0.02978558117960155086, 0.02893765586659238775, 0.02808825109001776565, 0.02723735486146829782, 0.02638496851396338397, 0.02553108459668443353, 0.02467570310976506878, 0.02381881846535705352, 0.02296043205912476348, 0.02210052993308101593, 0.02123911161101258924, 0.0203761752301055768, 0.01951171520241121171, 0.01864572966542644983, 0.01777821634394980907, 0.0169091630339813434, 0.01603857117619533063, 0.01516643704519870031, 0.01429275412160213587, 0.01341751961163247485, 0.0125407350206440428, 0.01166238524030487229, 0.01078247176637869495, 0.00990098994225263596]
-toTotalAir.XNonVapor=[0.90909093618392944336, 0.90983533860918264224, 0.91058093312739796232, 0.91132777934320019497, 0.91207587725659600153, 0.91282516712326344788, 0.91357570896687878559, 0.91432750222825376341, 0.91508054746753564324, 0.9158347842377813075, 0.91659027326761433052, 0.91734701399550278023, 0.91810500642147330197, 0.91886431015012626222, 0.91962480540507141047, 0.92038655235627775397, 0.92114961174625109575, 0.92191392169624142294, 0.9226794833424929454, 0.92344629782860432332, 0.92421442247372853629, 0.92498379996246071766, 0.92575448760647538471, 0.92652642694668041479, 0.92729967874099994418, 0.92807424068450927734, 0.92885005548157395516, 0.92962723886960130226, 0.93040567627203096812, 0.93118542497916800826, 0.93196642305682264595, 0.93274879436900481888, 0.93353247698621433237, 0.93431746856672004409, 0.93510377378936537784, 0.93589144992129191802, 0.93668037540035931077, 0.93747067413775730937, 0.93826234378454309581, 0.9390553247360718947, 0.93984961462329252857, 0.94064527778504414268, 0.9414423118562545989, 0.94224065485072228121, 0.94304037113201355513, 0.94384145832262145159, 0.94464385442494025469, 0.94544768343027363322, 0.94625282374088293125, 0.94705939215941881137, 0.94786727428436279297, 0.94867658692389622566, 0.94948727047253322908, 0.95029932493112634351, 0.9511128050506141296, 0.95192766092374592191, 0.95274388770654383496, 0.95356154500388334849, 0.9543806328151073215, 0.95520109153621657327, 0.9560229162639805045, 0.95684623600427309853, 0.95767092665423758646, 0.95849704781866096326, 0.95932465910176156765, 0.96015364129467628551, 0.96098404904851397745, 0.96181589226089636568, 0.9626492255922401986, 0.9634839298333329749, 0.96432018379787809437, 0.96515780867281164568, 0.96599691865973880134, 0.96683746415899796123, 0.9676794997763658035, 0.9685230255126953125, 0.96936798176362570789, 0.97021442813351765899, 0.97106236462237105478, 0.97191172655832036575, 0.97276264327593098269, 0.97361505011249693808, 0.97446888746381821189, 0.9753242745388817081, 0.97618115173290676001, 0.97703957352903270106, 0.97789949055574920678, 0.97876089770213769992, 0.97962385457213241313, 0.98048830156108868206, 0.98135429827365128208, 0.98222177993073545021, 0.98309081647698415285, 0.98396140274683918658, 0.98483353874044876619, 0.98570722445807856804, 0.98658245989932080722, 0.98745923983373973254, 0.98833763431710508485, 0.98921751892056875022, 0.99009901285171508789]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_BaseClasses_Examples_DewPointTemperatureDerivativeCheck.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_BaseClasses_Examples_DewPointTemperatureDerivativeCheck.txt
deleted file mode 100644
index 754c77ac..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_BaseClasses_Examples_DewPointTemperatureDerivativeCheck.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-last-generated=2015-08-19
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "1",
- "linear": " "
-}
-y=[611.2008056640625, 754.82009544356310470903, 920.01659791561587553588, 1107.69516696491768925625, 1318.44952836064976509078, 1552.53779575107023447345, 1809.87103019987762309029, 2090.00265132709728277405, 2392.13533478665021902998, 2715.13684450826849570149, 3057.55563052113029698376, 3417.65279573389898359892, 3793.43829462842131761136, 4182.70380225902317761211, 4583.06747521435590897454, 4992.01879753519096993841, 5406.96255160942837392213, 5825.26031525030794000486, 6244.27362632264976127772, 6661.40879032414886751212, 7074.14794854208776087034, 7480.08511321075911837397, 7876.95903092589924199274, 8262.67423384496214566752, 8635.32191563002925249748, 8993.2041015625, 9334.83575789189490024, 9658.96106815585335425567, 9964.55269885442976374179, 10250.81524716843523492571, 10517.17976327312317152973, 10763.30072451161504432093, 10989.0470277319363958668, 11194.48929238778146100231, 11379.88958496741361159366, 11545.68856852750650432426, 11692.4882893393933045445, 11821.03900458815041929483, 11932.22360479080634831917, 12027.0380806609864521306, 12106.58399493966862792149, 12172.04591902201536868233, 12224.68260863710202102084, 12265.81152447519889392424, 12296.79687134339474141598, 12319.0400403754465514794, 12333.96972545800963416696, 12343.03320265089860185981, 12347.68945297984464559704, 12349.40527341752749634907, 12349.650390625, 12349.89550783236336428672, 12351.61132827015535440296, 12356.27050828692881623283, 12365.3476573566731531173, 12380.32519399409648030996, 12402.69824587226321455091, 12433.97949113815957389306, 12475.71192276918372954242, 12529.47165860181667085271, 12596.88866095599223626778, 12679.65430240297064301558, 12779.53713913724459416699, 12898.40240627188541111536, 13038.23338957336454768665, 13201.14735801201277354266, 13389.43073722414374060463, 13605.5585529991913062986, 13852.23321276824572123587, 14132.4180406805517122848, 14449.3778305920677667018, 14806.72876694566912192386, 15208.48930911255229148082, 15659.14335801614470256027, 16163.70536743889715580735, 16727.80078125, 17357.76236013193192775361, 18060.71991560488459072076, 18844.7362305470414867159, 19718.9265595744909660425, 20693.62183379488487844355, 21780.56027629374875687063, 22993.07319141829430009238, 24346.33213078140033758245, 25857.63810715588988387026, 27546.71787296948241419159, 29436.09678349191744928248, 31551.53996055507377604954, 33922.5090230492569389753, 36582.73845242441893788055, 39570.88875965779880061746, 42931.30597692746960092336, 46714.84126450068288249895, 50979.8757068700942909345, 55793.48560897660354385152, 61232.69057034308934817091, 67385.99460741104849148542, 74355.18058260160614736378, 82257.16538998586474917829, 91226.33475534204626455903, 101417.25]
-y_comp=[611.2008056640625, 754.82009544356310470903, 920.01659791561587553588, 1107.69516696491768925625, 1318.44952836064976509078, 1552.53779575107023447345, 1809.87103019987762309029, 2090.00265132709728277405, 2392.13533478665021902998, 2715.13684450826849570149, 3057.55563052185789274517, 3417.65279573389898359892, 3793.43829462842131761136, 4182.70380225902317761211, 4583.06747521435590897454, 4992.01879753519096993841, 5406.96255160942837392213, 5825.26031525030794000486, 6244.27362632264976127772, 6661.40879032414886751212, 7074.14794854208776087034, 7480.08511321075911837397, 7876.95903092589924199274, 8262.67423384496214566752, 8635.32191563002925249748, 8993.2041015625, 9334.83575789189490024, 9658.96106815585335425567, 9964.55269885442976374179, 10250.81524716843523492571, 10517.17976327312317152973, 10763.30072451161504432093, 10989.0470277319363958668, 11194.48929238778146100231, 11379.88958496741361159366, 11545.68856852750650432426, 11692.4882893393933045445, 11821.0390045858221128583, 11932.22262822961602068972, 12027.0380806609864521306, 12106.58399493966862792149, 12172.04591902201536868233, 12224.68260863710202102084, 12265.81152447519889392424, 12296.79687134339474141598, 12319.0400403754465514794, 12333.96972545800963416696, 12343.03222608872601995245, 12347.68945297984464559704, 12349.40527341752749634907, 12349.650390625, 12349.89550783236336428672, 12351.61132827015535440296, 12356.27050828692881623283, 12365.3476573566731531173, 12380.32519399409648030996, 12402.69824587226321455091, 12433.98046770051405474078, 12475.71192276918372954242, 12529.47165860356290068012, 12596.88866095599223626778, 12679.65430240297064301558, 12779.53713913855426653754, 12898.40240627188541111536, 13038.23338957336454768665, 13201.14735801201277354266, 13389.43073722414374060463, 13605.5585529991913062986, 13852.23321277173818089068, 14132.4180406805517122848, 14449.3778305920677667018, 14806.72876694566912192386, 15208.49028567447021487169, 15659.14335801614470256027, 16163.70536743889715580735, 16727.80078125, 17357.76236013193192775361, 18060.71991561536196968518, 18844.7362305470414867159, 19718.9265595744909660425, 20693.62378691988487844355, 21780.56222941642045043409, 22993.07319141829430009238, 24346.33213079420602298342, 25857.63810715588988387026, 27546.71787296948241419159, 29436.09678350588728790171, 31551.53996055507377604954, 33922.5090230492569389753, 36582.73845242441893788055, 39570.88875966944033280015, 42931.30597692746960092336, 46714.84517072507151169702, 50979.8757068700942909345, 55793.48560897660354385152, 61232.69447659308934817091, 67385.99460741104849148542, 74355.18058260160614736378, 82257.16538998586474917829, 91226.34256784204626455903, 101417.25]
-time=[-1., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_BaseClasses_Examples_DewPointTemperatureDerivativeCheck_amb.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_BaseClasses_Examples_DewPointTemperatureDerivativeCheck_amb.txt
deleted file mode 100644
index 2d7fa566..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_BaseClasses_Examples_DewPointTemperatureDerivativeCheck_amb.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-last-generated=2015-08-19
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "1",
- "linear": " "
-}
-y=[644.747802734375, 779.22291827045432910381, 934.63684773558713914099, 1112.75888876787439585314, 1315.2341904956945199956, 1543.53304035015253248275, 1798.90057123951328321709, 2082.30221691096176073188, 2394.37750529834193002898, 2735.40295007076201727614, 3105.2514513352334688534, 3503.37002007432602113113, 3928.76932335011861141538, 4380.01145265625473257387, 4855.22530835795168968616, 5352.121281054598512128, 5868.02997327284447237616, 6399.93430194138636579737, 6944.52646291358723829035, 7498.26868763178208610043, 8057.45086380575867224252, 8618.2622275607573101297, 9176.86627717011469940189, 9729.46347787042213894892, 10272.35983833495265571401, 10802.037109375, 11315.20187709751007787418, 11808.84199744364195794333, 12280.26752305600894032978, 12727.14522158039835630916, 13147.52551095599847030826, 13539.85440139770253153984, 13902.98657506933705008123, 14236.17974383500768453814, 14539.09169288373232120648, 14811.75894085613072093111, 15054.5830212363234750228, 15268.30068478380235319491, 15453.95796094596880720928, 15612.87596770651362021454, 15746.62306466904556145892, 15856.9795269374026247533, 15945.90232929386547766626, 16015.50097832008395926096, 16068.00292348947732534725, 16105.72851785326201934367, 16131.06640437542228028178, 16146.45507732020632829517, 16154.36230444106331560761, 16157.27734371605765772983, 16157.693359375, 16158.10937503394234227017, 16161.02441430915496312082, 16168.93945393110334407538, 16184.36425969362608157098, 16209.82616963327745907009, 16247.88379533386614639312, 16301.14745914993909536861, 16372.29688985863867856096, 16464.10933896487404126674, 16579.49412191854935372248, 16721.52149387796453083865, 16893.47466072452880325727, 17098.89268644691037479788, 17341.63279708315167226829, 17625.93146061235165689141, 17956.49036332333344034851, 18338.56047462663627811708, 18778.05435561922058695927, 19281.67395814667906961404, 19857.04864749535045120865, 20512.93015201889284071513, 21259.39462730641389498487, 22108.09923691016956581734, 23072.5943082702906394843, 24168.685546875, 25414.90558009521191706881, 26833.03550782705497113056, 28448.82206275658245431259, 30292.77315016429201932624, 32401.19656746627879329026, 34817.51111048118764301762, 37593.7873154518092633225, 40792.76899844375293469056, 44490.40875509897159645334, 48778.98717083633528091013, 53771.15256782109645428136, 59605.10641436878358945251, 66451.10515872032556217164, 74519.97368729884328786284, 84074.04859500963357277215, 95441.53576624413835816085, 109035.04330025598756037652, 125376.16710788148338906467, 145128.11465648224111646414, 169138.62596028464031405747, 198497.77033046039287000895, 234616.02050500852055847645, 279328.86707462847698479891, 335040.28576001350302249193, 404919.65625]
-y_comp=[644.747802734375, 779.22291827045432910381, 934.63684773558713914099, 1112.75888876787439585314, 1315.2341904956945199956, 1543.53304035015253248275, 1798.90057123951328321709, 2082.30221691096176073188, 2394.37750529834193002898, 2735.40295007076201727614, 3105.2514513352334688534, 3503.37002007432602113113, 3928.76932335011861141538, 4380.01145265625473257387, 4855.22530835795168968616, 5352.121281054598512128, 5868.02997327371758728987, 6399.93430194138636579737, 6944.52646291358723829035, 7498.26868763178208610043, 8057.45086380575867224252, 8618.2622275607573101297, 9176.86627717011469940189, 9729.46347787042213894892, 10272.35983833495265571401, 10802.037109375, 11315.20187709751007787418, 11808.84199744364195794333, 12280.26752305600894032978, 12727.14522158039835630916, 13147.52551095599847030826, 13539.85440139770253153984, 13902.98657506933705008123, 14236.17974383500768453814, 14539.09169288373232120648, 14811.75894085613072093111, 15054.5830212363234750228, 15268.30068478380235319491, 15453.95796094596880720928, 15612.87596770622258190997, 15746.62306466904556145892, 15856.97855037664885458071, 15945.90232929299236275256, 16015.50097832008395926096, 16068.00292348947732534725, 16105.72851785289822146297, 16131.06640437542228028178, 16146.45507732020632829517, 16154.36230444106331560761, 16157.27734371605765772983, 16157.693359375, 16158.10937503394234227017, 16161.02441430915496312082, 16168.93945393110334407538, 16184.36425969362608157098, 16209.82616963327745907009, 16247.88379533386614639312, 16301.14843571229357621633, 16372.29688985863867856096, 16464.11129208638158161193, 16579.49412191854935372248, 16721.52149387854660744779, 16893.47466072452880325727, 17098.89268644691037479788, 17341.63279708315167226829, 17625.93146061235165689141, 17956.49036332333344034851, 18338.56047462663627811708, 18778.05435561922058695927, 19281.67395814667906961404, 19857.04864749535045120865, 20512.93015201889284071513, 21259.39462730757804820314, 22108.09923691016956581734, 23072.59430827552932896651, 24168.6875, 25414.90558009521191706881, 26833.03746094157759216614, 28448.82206275774660753086, 30292.77315017244109185413, 32401.19656746627879329026, 34817.51111048118764301762, 37593.7873154518092633225, 40792.76899846936430549249, 44490.41266134198667714372, 48778.98717083633528091013, 53771.15256782109645428136, 59605.10641436878358945251, 66451.10515872032556217164, 74519.97368729884328786284, 84074.04859500963357277215, 95441.53576625810819678009, 109035.05111270476481877267, 125376.16710788148338906467, 145128.11465648224111646414, 169138.62596028464031405747, 198497.77033046039287000895, 234616.02050500852055847645, 279328.86707462847698479891, 335040.28576016251463443041, 404919.65625]
-time=[-1., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_BaseClasses_Examples_InverseDewPointTemperatureDerivativeCheck_amb.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_BaseClasses_Examples_InverseDewPointTemperatureDerivativeCheck_amb.txt
deleted file mode 100644
index 6add4aae..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_BaseClasses_Examples_InverseDewPointTemperatureDerivativeCheck_amb.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-last-generated=2015-08-19
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "1",
- "linear": " "
-}
-y=[272.315521240234375, 276.66586648619733068699, 279.93758838022318968797, 282.53683443196189273294, 284.67599647764694736907, 286.48022259266554101487, 288.02951014956556718971, 289.37817471946436853614, 290.56463475001447704926, 291.61727869344832697607, 292.55749564196486289802, 293.40194586351805128288, 294.16372645783189909707, 294.85342438243907281503, 295.47976769174977107468, 296.04983487775166395295, 296.56967180684625873255, 297.04437314805426240127, 297.47827118500634924203, 297.87512215998850706455, 298.23819010726498390795, 298.57031223260912611295, 298.87399295422795830746, 299.15152005729703432735, 299.40487647615418609348, 299.635833740234375, 299.84600819232423418725, 300.03692634459167720706, 300.20986936497507713284, 300.36614980410030284474, 300.50686649436823927317, 300.63308712946314926739, 300.74584968457185141233, 300.84606935258119619903, 300.93460080001028700281, 301.01232914421768782631, 301.08001709354539343622, 301.13848874333785943236, 301.18841551482000795659, 301.23059081797509861644, 301.26562500463842297904, 301.29428101480880286545, 301.31716918574238661677, 301.33499145552377740387, 301.34835815272117542918, 301.35791015681843418861, 301.36434936475689028157, 301.3682250974516136921, 301.37020874017298410763, 301.37097167967726818461, 301.371063232421875, 301.37115478516648181539, 301.37188720709946210263, 301.3739013673921363079, 301.37777710008685971843, 301.38418579045855949516, 301.39373779454444957082, 301.40707397415917512262, 301.42477417360532854218, 301.44747923915201681666, 301.47576903839853912359, 301.51028442612005164847, 301.55157471926850121235, 301.60021975195553523008, 301.65673827768478076905, 301.72167964675469420399, 301.7955932900949278519, 301.87887571684228760205, 301.97204582891583868332, 302.07553103201638577957, 302.18966671271306267954, 302.31484994005387534344, 302.45138551514531854991, 302.59954827605190530448, 302.75958260924363685263, 302.931671142578125, 303.11596697964665736436, 303.31256081889705455978, 303.52151486707595040571, 303.74285907771223946838, 303.97656221551062571962, 304.22256463742098731018, 304.48068256294897082626, 304.75085413162815939359, 305.0328368115262946958, 305.3264161946132162484, 305.63128617864367697621, 305.94723495469980889538, 306.27389542236016950483, 306.61090136959586516241, 306.95791605058224149616, 307.31454480728251610344, 307.68038989111204273286, 308.05505344049072391499, 308.43807992646162574601, 308.82904099882483706097, 309.22750820991927866999, 309.63302617186843690433, 310.04519697947307577124, 310.46353109294511796179, 310.887664794921875]
-y_comp=[272.315521240234375, 276.66586648619733068699, 279.93758838022318968797, 282.53683443196189273294, 284.67599647764694736907, 286.48022259266554101487, 288.02951014956556718971, 289.37817471946436853614, 290.56463475001447704926, 291.61727869344832697607, 292.55749564196486289802, 293.40194586351805128288, 294.16372645783189909707, 294.85342438243907281503, 295.47976769174977107468, 296.04983487775166395295, 296.56967180684625873255, 297.04437314805426240127, 297.47827118500634924203, 297.87512215998850706455, 298.23815958986875784831, 298.57031223260912611295, 298.87399295422795830746, 299.15152005729703432735, 299.40487647615418609348, 299.635833740234375, 299.84600819232423418725, 300.03692634459167720706, 300.20986936497507713284, 300.36614980410030284474, 300.50686649436823927317, 300.63308712942676947932, 300.74584968457185141233, 300.84606935258119619903, 300.93460080001028700281, 301.01232914421768782631, 301.08001709354539343622, 301.13848874333785943236, 301.18841551482000795659, 301.23056030040606856346, 301.26562500463842297904, 301.29428101480880286545, 301.31716918574238661677, 301.33499145552377740387, 301.34835815272117542918, 301.35791015681843418861, 301.36434936475689028157, 301.3682250974516136921, 301.37020874017298410763, 301.37094116210255378974, 301.371063232421875, 301.37115478516648181539, 301.37188720709946210263, 301.3739013673921363079, 301.37777710008685971843, 301.38418579045855949516, 301.39373779454444957082, 301.40704345658559759613, 301.42477417360532854218, 301.44747923915201681666, 301.47576903839853912359, 301.51028442612005164847, 301.55157471926850121235, 301.60018923445016980622, 301.65673827768478076905, 301.72167964675469420399, 301.795562772571372534, 301.87887571684228760205, 301.97204582891583868332, 302.07553103201638577957, 302.18966671271306267954, 302.31484994005387534344, 302.45138551514531854991, 302.59954827605190530448, 302.75958260924363685263, 302.931671142578125, 303.11596697964665736436, 303.31256081889705455978, 303.52151486707595040571, 303.74285907758491021013, 303.97656221551062571962, 304.22253411987924209825, 304.48068256294897082626, 304.75085413162815939359, 305.0328368115262946958, 305.32638567712604071858, 305.63128617864367697621, 305.94723495469980889538, 306.27386490485480408097, 306.61090136959586516241, 306.95791605058224149616, 307.31454480728251610344, 307.68038989111204273286, 308.05505344049072391499, 308.43807992642524595794, 308.82904099882483706097, 309.22750820991927866999, 309.63302617186843690433, 310.04519697947307577124, 310.46353109294511796179, 310.887664794921875]
-time=[-1., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_BaseClasses_Examples_SaturationPressureDerivativeCheck.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_BaseClasses_Examples_SaturationPressureDerivativeCheck.txt
deleted file mode 100644
index 6ece14e2..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_BaseClasses_Examples_SaturationPressureDerivativeCheck.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-last-generated=2016-03-15
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "1",
- "linear": " "
-}
-y=[0.03226286172866821289, 0.07858306324665023657, 0.1766820819340704507, 0.37002757241603811966, 0.72746747528858746179, 1.35149781468546548169, 2.38633650739464808765, 4.02460344084558929723, 6.51138736798267103723, 10.14460319099708662804, 15.27072226337863014578, 22.2756120863405371324, 31.57070431140159882943, 43.57486238974464498597, 58.69349835530860559629, 77.29606194737672808515, 99.69397096108089328936, 126.11977362982875661146, 156.70996837318617167512, 191.49257785543542809137, 230.37897070389448117567, 273.16231657137007005076, 319.52185634684701653896, 369.03127439114319940927, 421.17286199856670236841, 475.355560302734375, 530.93392993332145124441, 587.66152258044860445807, 640.03954499651172227459, 688.28866478553948127228, 735.29475243075057733222, 780.24736498953222962882, 822.76510494576257315202, 862.53113472447228105011, 899.29680126279379237531, 932.88295341936998283927, 963.17871262408175425662, 990.13951414738698986184, 1013.78295299484614133689, 1034.18383675033919644193, 1051.46863023743480880512, 1065.80908656008773505164, 1077.41589166461585591605, 1086.53222679313012122293, 1093.42748941959530384338, 1098.39196806693144026212, 1101.73083471384597942233, 1103.76037587043811072363, 1104.8039550456014694646, 1105.18859862833778606728, 1105.2435302734375, 1105.29846191853721393272, 1105.68334964192581537645, 1106.72839366113930736901, 1108.76611352986947167665, 1112.13269013319222722203, 1117.17175376083832816221, 1124.23791480170211798395, 1133.70190627687725282158, 1145.95653815156651944562, 1161.42443596417933804332, 1180.56579718380544363754, 1203.88953336180611586315, 1231.964736557826427088, 1265.43505646004336995247, 1305.03610763082565426885, 1351.61537475078466741252, 1406.15660584173679126252, 1469.80903367649807478301, 1543.92299296077226244961, 1630.09189169981641498453, 1730.20527194502187739999, 1846.51087941629316446779, 1981.69342158794916031184, 2138.96908649853321549017, 2322.2021484375, 2536.04954013159795067622, 2786.13667737084006148507, 3079.28072449750106898136, 3423.75764092060853727162, 3829.63864372583429940278, 4309.21374501336231332971, 4877.49898524083437223453, 5552.88332887657270475756, 6357.9303553785839540069, 7320.35610724308844510233, 8474.2589684406830201624, 9861.65358522957831155509, 11534.33292329456708102953, 13556.21613018908828962594, 16006.21424487878903164528, 18981.81369505791008123197, 22603.40768305691744899377, 27019.67431874941757996567, 32414.20848007762106135488, 39013.46589996075636008754, 47096.55910140355990733951, 57007.21227087878651218489, 69167.91316744957293849438, 84097.18769469257676973939, 102430.3828125]
-y_comp=[0.03226286172866821289, 0.07858307069719530635, 0.17668208193415038676, 0.37002760221834274379, 0.72746747528858746179, 1.35149781468546548169, 2.38633650739464808765, 4.02460344084558929723, 6.51138736798267103723, 10.14460319099708662804, 15.27072226337863014578, 22.27561208632689471187, 31.57070431140159882943, 43.57486238973555003895, 58.69349835530860559629, 77.29606194737672808515, 99.69397096109453570989, 126.11977362982875661146, 156.70996837318617167512, 191.49257785543542809137, 230.37897070389448117567, 273.16231657137007005076, 319.52185634684701653896, 369.03127439114319940927, 421.17289251599930821612, 475.355560302734375, 530.93392993332145124441, 587.66152258044860445807, 640.03954499651172227459, 688.28866478553948127228, 735.29475243075057733222, 780.24736498953222962882, 822.76510494576257315202, 862.53113472447228105011, 899.29680126279379237531, 932.88295341936998283927, 963.17871262408175425662, 990.13951414738698986184, 1013.78295299484614133689, 1034.18383675033919644193, 1051.46863023743480880512, 1065.80908656008773505164, 1077.41589166461585591605, 1086.53222679313012122293, 1093.42748941959530384338, 1098.39196806693144026212, 1101.73083471384597942233, 1103.76037587043811072363, 1104.8039550456014694646, 1105.18859862833778606728, 1105.2435302734375, 1105.29846191853721393272, 1105.68334964192581537645, 1106.72839366113930736901, 1108.76611352986947167665, 1112.13269013319222722203, 1117.17187583106897363905, 1124.23791480170211798395, 1133.70190627687725282158, 1145.9566602216607407172, 1161.42443596417933804332, 1180.56579718380544363754, 1203.88953336180611586315, 1231.964736557826427088, 1265.43505646007974974054, 1305.03610763118945214956, 1351.61537475078466741252, 1406.15660584173679126252, 1469.80903367649807478301, 1543.92299296077226244961, 1630.09189169981641498453, 1730.20527194502187739999, 1846.51087941629316446779, 1981.69342158820381882833, 2138.96908649853321549017, 2322.2021484375, 2536.04954013276210389449, 2786.13667737084006148507, 3079.28096863812606898136, 3423.75764092060853727162, 3829.63864372583429940278, 4309.21374501336231332971, 4877.49898524083437223453, 5552.88381715462128340732, 6357.9308436589608390932, 7320.35610724308844510233, 8474.2589684406830201624, 9861.65358522957831155509, 11534.33292329456708102953, 13556.21710674460337031633, 16006.21522143837864859961, 18981.81369505791008123197, 22603.40768305691744899377, 27019.67431875640249927528, 32414.20848007762106135488, 39013.46589996075636008754, 47096.55910140355990733951, 57007.21227087878651218489, 69167.91316744957293849438, 84097.18769469257676973939, 102430.3828125]
-time=[-1., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_BaseClasses_Examples_WaterVaporPressureDerivativeCheck.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_BaseClasses_Examples_WaterVaporPressureDerivativeCheck.txt
deleted file mode 100644
index 9c34574b..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_BaseClasses_Examples_WaterVaporPressureDerivativeCheck.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-last-generated=2015-08-19
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "number of continuous time states": "1",
- "linear": " "
-}
-y=[62428.19140625, 65204.20957392311538569629, 67800.76291278927237726748, 70230.757530421600677073, 72505.82994986700941808522, 74636.56002594658639281988, 76632.53859895376081112772, 78502.51691097691946197301, 80254.47432468540500849485, 81895.74942828550410922617, 83433.05556827325199265033, 84872.56830721754522528499, 86219.99156195051909890026, 87480.60213980707339942455, 88659.28286865398695226759, 89760.55404893997183535248, 90788.66441509801370557398, 91747.53245506377425044775, 92640.85094170956290327013, 93472.0861271355242934078, 94244.4618177843076409772, 94961.04629508058133069426, 95624.72663797887798864394, 96238.23500217463879380375, 96804.1635403643740573898, 97324.984375, 97803.04662742004438769072, 98240.59392282518092542887, 98639.7968291836732532829, 99002.72633373970165848732, 99331.39071707268885802478, 99627.70305733023269567639, 99893.55486516804376151413, 100130.76566448567609768361, 100341.10149097457178868353, 100526.30478933991980738938, 100688.06250884754990693182, 100828.04681221036298666149, 100947.88278241950320079923, 101049.19530688181112054735, 101133.57813616420025937259, 101202.60158412526652682573, 101257.8281160453479969874, 101300.81250108266249299049, 101333.10937119147274643183, 101356.23437636496964842081, 101371.73437385447323322296, 101381.14062450756318867207, 101385.96874984982423484325, 101387.74218747991835698485, 101388., 101388.25000002095475792885, 101390.03125015017576515675, 101394.85937548981746658683, 101404.25781364552676677704, 101419.74999863503035157919, 101442.85156630328856408596, 101475.09374891966581344604, 101517.97657142671232577413, 101572.99997845855250488967, 101641.67186389982816763222, 101725.47656807395105715841, 101825.87502977665280923247, 101944.34381195144669618458, 102082.2968662921484792605, 102241.17177511585759930313, 102422.34381979316822253168, 102627.17183662492607254535, 102856.99201575515326112509, 103113.09381495030538644642, 103396.72647460660664364696, 103709.09396646686946041882, 104051.35941799907595850527, 104424.62483899094513617456, 104829.93772796634584665298, 105268.28125, 105740.58640770519559737295, 106247.69475330246496014297, 106790.39837108751817140728, 107369.39112655809731222689, 107985.30393550511507783085, 108638.67171562308794818819, 109329.9614483200857648626, 110059.53027313307393342257, 110827.66378225163498427719, 111634.53955733396287541837, 112480.25658047448087017983, 113364.81207081017782911658, 114288.1020138180028880015, 115249.9467213274328969419, 116250.04626982781337574124, 117288.03162926637742202729, 118363.41550175368320196867, 119475.63981905371474567801, 120624.0627789119171211496, 121807.93893623619806021452, 123026.4442843173019355163, 124278.68765164229262154549, 125563.69671177207783330232, 126880.42060739803127944469, 128227.75]
-y_comp=[62428.19140625, 65204.20957392311538569629, 67800.76291278927237726748, 70230.757530421600677073, 72505.82994986700941808522, 74636.56002594658639281988, 76632.53859895376081112772, 78502.51691097691946197301, 80254.47432468540500849485, 81895.74942828550410922617, 83433.05556827325199265033, 84872.56830721754522528499, 86219.99156195051909890026, 87480.60213980707339942455, 88659.28286865398695226759, 89760.55404893997183535248, 90788.66441509801370557398, 91747.53245506377425044775, 92640.85094170956290327013, 93472.07831464483751915395, 94244.4618177843076409772, 94961.04629508058133069426, 95624.72663797887798864394, 96238.23500217463879380375, 96804.1635403643740573898, 97324.984375, 97803.03881494099914561957, 98240.59392282518092542887, 98639.79682917901664040983, 99002.72633373970165848732, 99331.39071707268885802478, 99627.70305733023269567639, 99893.55486516804376151413, 100130.76566448567609768361, 100341.10149097457178868353, 100526.30478933991980738938, 100688.06250884754990693182, 100828.04681221036298666149, 100947.88278241950320079923, 101049.19530687948281411082, 101133.57813615837949328125, 101202.60158412526652682573, 101257.8281160453479969874, 101300.81250108266249299049, 101333.10937119147274643183, 101356.23437636496964842081, 101371.73437385447323322296, 101381.14062450756318867207, 101385.96874984807800501585, 101387.74218747991835698485, 101388., 101388.25000002095475792885, 101390.03125015017576515675, 101394.85937548981746658683, 101404.25781364552676677704, 101419.74999863503035157919, 101442.85156630328856408596, 101475.09374891966581344604, 101517.96875893369724508375, 101572.99997845855250488967, 101641.67186389982816763222, 101725.47656807395105715841, 101825.87502977665280923247, 101944.34381195144669618458, 102082.2968662921484792605, 102241.17177511585759930313, 102422.33600729316822253168, 102627.17183662492607254535, 102856.99201575515326112509, 103113.09381495030538644642, 103396.72647460660664364696, 103709.09396644125808961689, 104051.35941799907595850527, 104424.62483897464699111879, 104829.93772796634584665298, 105268.28125, 105740.58640770519559737295, 106247.69475326055544428527, 106790.39055858751817140728, 107369.39112655809731222689, 107985.29612305168120656163, 108638.67171562308794818819, 109329.9614483200857648626, 110059.53027313307393342257, 110827.66378225163498427719, 111634.53955731067981105298, 112480.25658047448087017983, 113364.81207081017782911658, 114288.1020138180028880015, 115249.9467213274328969419, 116250.04626982781337574124, 117288.02381676637742202729, 118363.41550175368320196867, 119475.63981905371474567801, 120624.0627789119171211496, 121807.93893623619806021452, 123026.4442843173019355163, 124278.68765164229262154549, 125563.69671177207783330232, 126880.42060739803127944469, 128227.75]
-time=[-1., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_SaturationPressure.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_SaturationPressure.txt
deleted file mode 100644
index 40dfed48..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_SaturationPressure.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-last-generated=2016-03-15
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-pSat=[0.03226286172866821289, 0.04391302571747932731, 0.05942725844625599413, 0.07997381849357887429, 0.10703978226480835578, 0.14250857834815461311, 0.18875402935818944017, 0.24875375430779403385, 0.32622568426701842315, 0.42579104553912600073, 0.55316917000882148692, 0.71540768067847315681, 0.92115563532224986609, 1.18098428140319477997, 1.50776324527932903408, 1.91710135541498449818, 2.42785856052174686681, 3.06273757981537197992, 3.84897528588122517235, 4.81913306640892002974, 6.01200112925890550741, 7.47365058106032620344, 9.25860714987604005444, 11.43122002990872587702, 14.0671898463966442705, 17.2552928924560546875, 21.09937504699236399119, 25.72050134206313387608, 31.25951314644803247234, 37.87970965468895911954, 45.76997512772816634197, 55.14829014988784194884, 66.26544305102873977376, 79.40929861842052162046, 94.90964679848022456099, 113.14313939646245898984, 134.53906043976218143143, 159.58584850549621592108, 188.83750917610993269591, 222.9214705764472341798, 262.546483739355551279, 308.51210289822836330131, 361.71775791876871153363, 423.17335437428079103483, 494.01155400570053188858, 575.68669166730364850082, 661.99272670852110422857, 754.70399132970976552315, 858.69537083403497490508, 975.12402944808354732231, 1105.2435302734375, 1250.40761835192461148836, 1412.07723284096346105798, 1591.82635305593839802896, 1791.34696610276114370208, 2012.46066307444266385573, 2257.11737094700811212533, 2527.40791986162957982742, 2825.5681541912285865692, 3153.98772822284445283003, 3515.21370557520913280314, 3911.96767286509520999971, 4347.1394332625541210291, 4823.80395077228604350239, 5345.22588410992739227368, 5914.86764183220748236636, 6536.39528581747981661465, 7213.69804954901701421477, 7950.87738456219631189015, 8752.26777885436968063004, 9622.44347181865123275202, 10566.22185116086984635331, 11588.67276239103375701234, 12695.14528391469866619445, 13891.24101132003306702245, 15182.8486328125, 16576.14592085289041278884, 18077.60260253920932882465, 19693.99897122960828710347, 21432.41217692501595593058, 23300.27310009919165167958, 25305.3139615410145779606, 27455.61097794897068524733, 29759.58603664691327139735, 32226.01845319716812809929, 34864.0247915735308197327, 37683.14429783191735623404, 40693.24852711034327512607, 43904.59534105387137969956, 47327.84883568954683141783, 50974.06371149047481594607, 54854.68097573481645667925, 58981.61794325083610601723, 63367.14913089519541244954, 68024.00115047756116837263, 72965.31860094431613106281, 78204.69913924897264223546, 83756.14781283526099286973, 89634.22290770748804789037, 95853.82987234577012713999, 102430.3828125]
-time=[0., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_X_pSatpphi.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_X_pSatpphi.txt
deleted file mode 100644
index 52bac75f..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_X_pSatpphi.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-phi=[0., 0.01000000000000000021, 0.02000000000000000042, 0.02999999999999999889, 0.04000000000000000083, 0.05000000000000000278, 0.05999999999999999778, 0.07000000000000000666, 0.08000000000000000167, 0.08999999999999999667, 0.10000000000000000555, 0.11000000000000000056, 0.11999999999999999556, 0.13000000000000000444, 0.14000000000000001332, 0.14999999999999999445, 0.16000000000000000333, 0.17000000000000001221, 0.17999999999999999334, 0.19000000000000000222, 0.2000000000000000111, 0.20999999999999999223, 0.22000000000000000111, 0.23000000000000000999, 0.23999999999999999112, 0.25, 0.26000000000000000888, 0.27000000000000001776, 0.28000000000000002665, 0.28999999999999998002, 0.2999999999999999889, 0.30999999999999999778, 0.32000000000000000666, 0.33000000000000001554, 0.34000000000000002442, 0.3499999999999999778, 0.35999999999999998668, 0.36999999999999999556, 0.38000000000000000444, 0.39000000000000001332, 0.4000000000000000222, 0.40999999999999997558, 0.41999999999999998446, 0.42999999999999999334, 0.44000000000000000222, 0.4500000000000000111, 0.46000000000000001998, 0.46999999999999997335, 0.47999999999999998224, 0.48999999999999999112, 0.5, 0.51000000000000000888, 0.52000000000000001776, 0.53000000000000002665, 0.54000000000000003553, 0.55000000000000004441, 0.56000000000000005329, 0.56999999999999995115, 0.57999999999999996003, 0.58999999999999996891, 0.5999999999999999778, 0.60999999999999998668, 0.61999999999999999556, 0.63000000000000000444, 0.64000000000000001332, 0.6500000000000000222, 0.66000000000000003109, 0.67000000000000003997, 0.68000000000000004885, 0.68999999999999994671, 0.69999999999999995559, 0.70999999999999996447, 0.71999999999999997335, 0.72999999999999998224, 0.73999999999999999112, 0.75, 0.76000000000000000888, 0.77000000000000001776, 0.78000000000000002665, 0.79000000000000003553, 0.80000000000000004441, 0.81000000000000005329, 0.81999999999999995115, 0.82999999999999996003, 0.83999999999999996891, 0.8499999999999999778, 0.85999999999999998668, 0.86999999999999999556, 0.88000000000000000444, 0.89000000000000001332, 0.9000000000000000222, 0.91000000000000003109, 0.92000000000000003997, 0.93000000000000004885, 0.93999999999999994671, 0.94999999999999995559, 0.95999999999999996447, 0.96999999999999997335, 0.97999999999999998224, 0.98999999999999999112, 1.]
-time=[0., 1.]
-X_w=[0., 0.00014364233677999729, 0.00028730976106296717, 0.00043100227284891039, 0.00057471987213785077, 0.00071846256125697374, 0.00086223039143227263, 0.00100602337196310072, 0.00114984137715396298, 0.00129368453729940985, 0.00143755283391058656, 0.00158144639265735479, 0.00172536498070969559, 0.00186930883089700384, 0.0020132777195287538, 0.00215727175384503771, 0.00230129114846631217, 0.0024453354741833769, 0.00258940517841520267, 0.00273350001023357769, 0.00287762000586687773, 0.00302176559482517353, 0.00316593588186036418, 0.00331013154740989997, 0.00345435257356605917, 0.00359859876334667206, 0.00374287031381287253, 0.00388716657996150163, 0.0040314886546931961, 0.00417583587518713904, 0.00432020827679914683, 0.00446460578873016101, 0.00460902891208304823, 0.0047534772163266804, 0.00489795109677847954, 0.00504245012299003002, 0.00518697386420871858, 0.00533152364751835004, 0.00547609857658856638, 0.00562069865141936759, 0.00576532390660995132, 0.00590997473853827667, 0.00605465118189041709, 0.00619935233971290363, 0.00634407954016118127, 0.00648883188637115488, 0.00663360941248960622, 0.00677841251579738065, 0.00692324123052869434, 0.00706809465927877006, 0.00721297413110733032, 0.00735787874869663679, 0.00750280897770115324, 0.00764776435247291504, 0.00779274494009268154, 0.00793775153754498579, 0.00808278281508889584, 0.00822784016971802278, 0.00837292360142483962, 0.0085180312475752161, 0.008663164105678774, 0.00880832390582449512, 0.0089535088517330233, 0.00909871894340435333, 0.00924395418083849042, 0.00938921549534690175, 0.00953450108957888502, 0.00967981362676672945, 0.00982515130972070987, 0.00997051506975332909, 0.01011590304422966408, 0.01026131802710388528, 0.01040675728877354413, 0.0105522225630168328, 0.01069771298301404674, 0.01084322948008775711, 0.01098877205424684741, 0.01113433977416874131, 0.01127993357116269073, 0.01142555164589738673, 0.01157119573426040708, 0.01171686589969777974, 0.01186256214222260012, 0.01200828353050141864, 0.01215403006454637488, 0.0122998018067420594, 0.01244560049478236029, 0.01259142432858546649, 0.01273727423947394917, 0.0128831492961252389, 0.01302905042985080288, 0.01317497583948527666, 0.01332092819590248618, 0.01346690662939286319, 0.01361291020864708115, 0.0137589389336620297, 0.01390499466707597644, 0.01405107467548291286, 0.01419718070026593053, 0.01434331373344358007, 0.01448947098106145859]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_pW_TDewPoi.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_pW_TDewPoi.txt
deleted file mode 100644
index 23514a98..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_pW_TDewPoi.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-TInv=[273.149993896484375, 274.14999391883748103282, 275.14999394119058706565, 276.14999396354363625505, 277.1499939858967991313, 278.14999382198539024103, 279.14999403060301119694, 280.14999386668472425299, 281.14999407530888220208, 282.14999353888998712137, 283.14999374748668969914, 284.14999395609254406736, 285.1499941647210789597, 286.14999437334967069546, 287.14999383688530087966, 288.14999330049369064, 289.14999425413333256074, 290.14999371768715263897, 291.14999318129554239931, 292.14999413491705126944, 293.14999359848906124171, 294.14999455217417789754, 295.14999401570071313472, 296.14999347929091300102, 297.14999443295783976282, 298.149993896484375, 299.14999485021496639092, 300.14999282370115452068, 301.14999377728622675932, 302.1499947309986282562, 303.14999270450300627999, 304.14999365808807851863, 305.1499946117823469649, 306.14999258530491488273, 307.14999353888998712137, 308.14999449256600883018, 309.14999246610676664204, 310.14999341969183888068, 311.14999437334967069546, 312.14999532708026208638, 313.14999330049369064, 314.14999425413333256074, 315.14999520786392395166, 316.14999318129554239931, 317.14999413491705126944, 318.14999508864764266036, 319.14999306209745100205, 320.14999401570071313472, 321.14999496943130452564, 322.14999294289930276136, 323.149993896484375, 324.14999485020075553621, 325.14999580391713607241, 326.14999675763351660862, 327.14999175094993688617, 328.1499927045207982701, 329.14999365808455422666, 330.14999461177166040216, 331.14999556548804093836, 332.14999651920442147457, 333.14999151255722154019, 334.14999246612808292412, 335.14999341969894430804, 336.1499943733425652681, 337.14999532705894580431, 338.14999628077532634052, 339.14999127416450619421, 340.14999222773536757813, 341.14999318130622896206, 342.14999413492057556141, 343.14999508862985067026, 344.14999604234623120647, 345.14999103577179084823, 346.14999198934265223215, 347.14999294291351361608, 348.149993896484375, 349.14999485020075553621, 350.14999580391713607241, 351.14999675763351660862, 352.14999175094993688617, 353.1499927045207982701, 354.14999365808455422666, 355.14999461177166040216, 356.14999556548804093836, 357.14999651920442147457, 358.14999151255722154019, 359.14999246612808292412, 360.14999341969894430804, 361.1499943733425652681, 362.14999532705894580431, 363.14999628077532634052, 364.14999127416450619421, 365.14999222773536757813, 366.14999318130622896206, 367.14999413492057556141, 368.14999508862985067026, 369.14999604234623120647, 370.14999103577179084823, 371.14999198934265223215, 372.14999294291351361608, 373.149993896484375]
-T=[273.149993896484375, 274.14999391883748103282, 275.14999394119058706565, 276.14999396354363625505, 277.1499939858967991313, 278.14999382198539024103, 279.14999403060301119694, 280.14999386668472425299, 281.14999407530888220208, 282.14999353888998712137, 283.14999374748668969914, 284.14999395609254406736, 285.1499941647210789597, 286.14999437334967069546, 287.14999383688530087966, 288.14999330049369064, 289.14999425413333256074, 290.14999371768715263897, 291.14999318129554239931, 292.14999413491705126944, 293.14999359848906124171, 294.14999455217417789754, 295.14999401570071313472, 296.14999347929091300102, 297.14999443295783976282, 298.149993896484375, 299.14999485021496639092, 300.14999282370115452068, 301.14999377728622675932, 302.1499947309986282562, 303.14999270450300627999, 304.14999365808807851863, 305.1499946117823469649, 306.14999258530491488273, 307.14999353888998712137, 308.14999449256600883018, 309.14999246610676664204, 310.14999341969183888068, 311.14999437334967069546, 312.14999532708026208638, 313.14999330049369064, 314.14999425413333256074, 315.14999520786392395166, 316.14999318129554239931, 317.14999413491705126944, 318.14999508864764266036, 319.14999306209745100205, 320.14999401570071313472, 321.14999496943130452564, 322.14999294289930276136, 323.149993896484375, 324.14999485020075553621, 325.14999580391713607241, 326.14999675763351660862, 327.14999175094993688617, 328.1499927045207982701, 329.14999365808455422666, 330.14999461177166040216, 331.14999556548804093836, 332.14999651920442147457, 333.14999151255722154019, 334.14999246612808292412, 335.14999341969894430804, 336.1499943733425652681, 337.14999532705894580431, 338.14999628077532634052, 339.14999127416450619421, 340.14999222773536757813, 341.14999318130622896206, 342.14999413492057556141, 343.14999508862985067026, 344.14999604234623120647, 345.14999103577179084823, 346.14999198934265223215, 347.14999294291351361608, 348.149993896484375, 349.14999485020075553621, 350.14999580391713607241, 351.14999675763351660862, 352.14999175094993688617, 353.1499927045207982701, 354.14999365808455422666, 355.14999461177166040216, 356.14999556548804093836, 357.14999651920442147457, 358.14999151255722154019, 359.14999246612808292412, 360.14999341969894430804, 361.1499943733425652681, 362.14999532705894580431, 363.14999628077532634052, 364.14999127416450619421, 365.14999222773536757813, 366.14999318130622896206, 367.14999413492057556141, 368.14999508862985067026, 369.14999604234623120647, 370.14999103577179084823, 371.14999198934265223215, 372.14999294291351361608, 373.149993896484375]
-time=[0., 1.]
-p_w=[611.2008056640625, 657.05877792042997498356, 705.94061506257605742576, 758.01636104753526979039, 813.46411647366323904862, 872.4697220567730937546, 935.22754779273361691594, 1001.94030558035251488036, 1072.81983735724747930362, 1148.08700856797577216639, 1227.97178957042638103303, 1312.71448277031981888285, 1402.56460014746721753909, 1497.78263976875246044074, 1598.63915400629571195168, 1705.41582845791799627477, 1818.40568143716063786997, 1937.91269787745181929495, 2064.25332559206935911789, 2197.75589226429883638048, 2338.76045510498806834221, 2487.62143868717203076812, 2644.70485331801046413602, 2810.39055439606954678311, 2985.0728506044038113032, 3169.1591796875, 3363.07196807706259278348, 3567.24733501741366126225, 3782.13913401509762479691, 4008.21381747316490873345, 4245.954300729794340441, 4495.86126735341440507909, 4758.45038873849352967227, 5034.25304920417511311825, 5323.82069520702862064354, 5627.72088954193168319762, 5946.53762112349340895889, 6280.87581410757593403105, 6631.35759374906865559751, 6998.62309878885298530804, 7383.33228597202923992882, 7786.16714025089913775446, 8207.82674001728992152493, 8649.02995214583279448561, 9110.51964425878031761386, 9593.05723132096682093106, 10097.42535292746833874844, 10624.43072854888850997668, 11174.90099671395000768825, 11749.68205955923804140184, 12349.650390625, 12975.69983109354143380187, 13628.75030069685089983977, 14309.74320842297311173752, 15019.64200611519663652871, 15759.4463691781711531803, 16530.16778198715473990887, 17332.85019753016968024895, 18168.55611607342143543065, 19038.37928927786197164096, 19943.43530795987680903636, 20884.8775383046486240346, 21863.87257276532909600064, 22881.61963725832538329996, 23939.34529815322093782015, 25038.30150851913276710548, 26179.76649225618893979117, 27365.05853896122425794601, 28595.51277865166048286483, 29872.49640501364774536341, 31197.40591128370579099283, 32571.6651230582210700959, 33996.72242626843944890425, 35474.07917288313910830766, 37005.24070642415608745068, 38591.7578125, 40235.20472552526189247146, 41937.18690830819105030969, 43699.3410844043391989544, 45523.33587594993878155947, 47410.88443786322022788227, 49363.71437182881345506757, 51383.59522403049777494743, 53472.3160561624463298358, 55631.71671399567276239395, 57863.64304597861337242648, 60170.01618877123109996319, 62552.75666155379440169781, 65013.82932132879068376496, 67555.22245563255273737013, 70178.97512535389978438616, 72887.13343273171631153673, 75681.82340233385912142694, 78565.16978696358273737133, 81539.33665982444654218853, 84606.51934901652566622943, 87768.96003551071044057608, 91028.91243512515211477876, 94388.72007710288744419813, 97850.70759645543876104057, 101417.25]
-dT=[0., 0., 0.00000000000005684341, 0., 0.00000000000005684339, 0., 0., 0.00000000000000000001, -0.00000000000011368643, 0.0000000000000000001, -0.00000000000000000004, 0.00000000000000000002, 0., -0.00000000000005684342, -0.00000000000005684338, 0.00000000000000000017, 0.0000000000000000001, 0.00000000000000000005, 0.0000000000000000002, -0.00000000000005684335, 0.00000000000005684333, -0.00000000000011368665, 0.00000000000000000003, 0., 0.00000000000000000015, 0.00000000000005684342, 0.00000000000005684315, 0., 0.00000000000005684349, 0.00000000000005684247, 0., 0., -0.00000000000005684362, -0.00000000000005684305, 0., 0.00000000000000000017, 0.00000000000039790231, 0., 0., 0.00000000000005684301, -0.00000000000000000017, 0.0000000000000000001, 0., -0.00000000000005684301, 0.00000000000000000007, -0.00000000000005684274, 0.00000000000000000024, -0.00000000000000000003, 0.00000000000005684311, 0.00000000000005684342, 0.00000000000005684342, 0.00000000000005684369, 0.0000000000001136863, 0.00000000000011368684, 0.00000000000011368623, 0.00000000000017053026, 0.00000000000022737361, 0.00000000000011368684, 0.00000000000017052978, 0.00000000000011368609, 0.00000000000011368616, 0.00000000000005684342, 0.00000000000005684328, 0.0000000000001136867, 0.00000000000005684301, 0.00000000000005684342, -0.00000000000000000075, -0.00000000000005684247, 0., -0.00000000000005684342, 0.00000000000011368718, -0.00000000000028421587, -0.00000000000011368602, 0.00000000000005684233, 0.00000000000000000027, 0., 0., -0.00000000000005684233, 0.00000000000000000081, 0.00000000000005684281, 0.00000000000000000034, 0.0000000000001136867, -0.00000000000005684301, 0., -0.00000000000005684193, 0., 0., 0.00000000000039790217, 0.00000000000000000014, 0., -0.00000000000000000068, -0.00000000000000000075, 0.00000000000011368399, 0.0000000000000000002, 0.00000000000000000007, 0.00000000000005684342, -0.00000000000005684342, -0.00000000000000000163, 0.00000000000005684342, -0.00000000000000000027, 0.00000000000011368684]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_pW_TDewPoi_comparison.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_pW_TDewPoi_comparison.txt
deleted file mode 100644
index 8df7f27d..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_pW_TDewPoi_comparison.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '0', 'linear': ' '}
-p_w=[644.747802734375, 657.33050565562007250264, 670.15881405670631920657, 683.23742764503265334497, 696.57135130367328201828, 710.16546528791354830901, 724.02484318895551496098, 738.15472369673193497874, 752.56036637550118939544, 767.24712605462605097273, 782.22057880619377101539, 797.48620697518526867498, 813.04968684029938685853, 828.91699984164642955875, 845.09393213378484688292, 861.58653794500253297883, 878.40106809502549367608, 895.54369808280068809836, 913.02092246109896223061, 930.83917666096238008322, 949.00518253250641009799, 967.5257691203665899593, 986.40771712090179335064, 1005.65819503095008258242, 1025.28443447901395302324, 1045.2935791015625, 1065.6932569858220176684, 1086.49106638081343589874, 1107.69469960120272844506, 1129.31227410816723022435, 1151.35153602357149793534, 1173.8210395232708833646, 1196.72914255217892787186, 1220.08407558287285610277, 1243.89501094985757845279, 1268.17054686430424226273, 1292.91976412666508622351, 1318.15208748445274977712, 1343.87684346395349166414, 1370.10355358010156123783, 1396.84214702502117688709, 1424.10254892518605629448, 1451.89505639954381877033, 1480.22983797457482069149, 1509.11756067867145247874, 1538.56924938470274355495, 1568.59543373452493142395, 1599.20776736368839010538, 1630.41751434335719750379, 1662.23629754508510814048, 1694.6761474609375, 1727.74905534465347045625, 1761.46735021734389192716, 1795.84372742468644901237, 1830.89079335640667522966, 1866.62202738798714563018, 1903.05052835672199762485, 1940.19009034971145410964, 1978.05438521643554850016, 2016.65757312126311262546, 2056.01406559659517370164, 2096.13861403211603828822, 2137.04636706177370797377, 2178.75246152480531236506, 2221.2725224701052866294, 2264.62241900686603912618, 2308.8179984292928565992, 2353.8761449241451373382, 2399.81393173230071624857, 2446.64820465558977957699, 2494.39629781678377185017, 2543.07627754805525910342, 2592.70615573749000759562, 2643.30483438425471831579, 2694.89081956483505564393, 2747.483642578125, 2801.1030790731870183663, 2855.76866016730946284952, 2911.50113786949623317923, 2968.32092205835124332225, 3026.24993040955405376735, 3085.30955612245406882721, 3145.52177208332159352722, 3206.90903918909907588386, 3269.49430667031037955894, 3333.30062794816785753937, 3398.35244528630710192374, 3464.67404039630582701648, 3532.28982753856780618662, 3601.22495327604656267795, 3671.50578474385565641569, 3743.15752547648025938543, 3816.20812909367577958619, 3890.68427249105980081367, 3966.61403198598691233201, 4044.02548397977625427302, 4122.94792522421175817726, 4203.4099242638021678431, 4285.44222514225657505449, 4369.07609149856580188498, 4454.341796875]
-p_w_ashrae=[611.2008056640625, 624.65051299942933837883, 638.36200013178029166738, 652.3396615926307049449, 666.58789191358096104523, 681.11126599947351678566, 695.91424761348264382832, 711.00158646099691850395, 726.37787143315449611691, 742.0478459160773354597, 758.01635502445185466058, 774.28833105899491329183, 790.86865684115582553204, 807.76233724785367940058, 824.97448627110350116709, 842.51024337614171599853, 860.37476231964831185905, 878.57336097954555498291, 897.11137580283480019716, 915.99426724728789395158, 935.2275332884026965985, 954.81666337576371006435, 974.7672753536631944371, 995.08507446874773449963, 1015.77601219732150639175, 1036.845703125, 1058.30019158190589223523, 1080.14536213604583281267, 1102.38757057162547425833, 1125.03261187431553480565, 1148.08700845294310965983, 1171.55687912997063904186, 1195.44862567036170730717, 1219.76876671073068791884, 1244.52391686523696989752, 1269.72059623266795824748, 1295.36544157158846246602, 1321.46544156831441796385, 1348.02723447894413766335, 1375.05802247287010686705, 1402.56455868583429946739, 1430.55433140364175415016, 1459.03421742337718569615, 1488.01157580966400928446, 1517.49390358656842181517, 1547.48868358817662738147, 1578.00327025997944474511, 1609.04565803554532976705, 1640.6232031728757192468, 1672.74398771283881615091, 1705.4158935546875, 1738.64676052987874754763, 1772.44501140836291597225, 1806.81858078489972285752, 1841.77555925250408108695, 1877.32503057960479964095, 1913.47484483907965113758, 1950.23403534483941257349, 1987.61090284723763943475, 2025.61448054500056059624, 2064.25332523678480356466, 2103.53680866796366899507, 2143.47385778450279758545, 2184.07375001920809154399, 2225.34551860489091268391, 2267.29868499041913310066, 2309.94251438665332898381, 2353.28728070489478341187, 2397.34200930113593130955, 2442.11670999807438420248, 2487.62139266310668972437, 2533.86606698773448442807, 2580.86070452719877721393, 2628.61563098772057855967, 2677.14131084838572860463, 2726.4482421875, 2776.54667909408317427733, 2827.44760777635383419693, 2879.16152631611112155952, 2931.69934944610531601938, 2985.0726898803623043932, 3039.29222331970959203318, 3094.36942453097026373143, 3150.31552393400261280476, 3207.14175199474266264588, 3264.85996895692460384453, 3323.48209335623187143938, 3383.01999096632380314986, 3443.48562480238842908875, 3504.89071365284144121688, 3567.24770863891853878158, 3630.56892471112041675951, 3694.86707953476616239641, 3760.15449403410730155883, 3826.44410774656125795445, 3893.7488602609050758474, 3962.08120264654098718893, 4031.45439016924137831666, 4101.88218908147518959595, 4173.37786109442549786763, 4245.95458984375]
-time=[0., 1.]
-r_p=[0.9479687809944152832, 0.95028376584397911131, 0.95255333195219904496, 0.95477736010974545433, 0.95695567150272431434, 0.95908814652903551234, 0.96117454794837087206, 0.96321481460267921459, 0.96520870959151783275, 0.9671561711089126101, 0.96905708284939662267, 0.97091132413303760096, 0.97271871614494187508, 0.97447919928188586614, 0.97619265307816527333, 0.97785907885583100985, 0.97947830018669779228, 0.98105025263673140135, 0.98257487904624207786, 0.98405212198471692098, 0.98548197704230577898, 0.98686426966745166567, 0.98819911495521461919, 0.98948639578350250368, 0.99072605436447114258, 0.99191814661026000977, 0.9930626760633437522, 0.99415951851588124644, 0.99520879971620268556, 0.9962104567064412608, 0.99716454632855056062, 0.99807107427417962597, 0.99893003761572052301, 0.99974155322112279176, 1.00050556633053178146, 1.00122225325610170188, 1.00189161207549837229, 1.00251364679184074014, 1.00308835532501872123, 1.00361609530375361921, 1.00409674616936750446, 1.00453031077596199871, 1.00491714524591113644, 1.00525712943940037647, 1.00555050379401200722, 1.0057972672209127829, 1.00599765762417825421, 1.00615167619304202162, 1.00625956067135269301, 1.00632143016480313236, 1.00633728504180908203, 1.00630748266485259279, 1.00623214225175039438, 1.00611126380420756732, 1.00594508687438422001, 1.00573384789165731767, 1.00547766692022921831, 1.00517678237355712056, 1.00483131346619436464, 1.00444149861742881846, 1.00400745976257210756, 1.00352943014427120616, 1.00300765063257824039, 1.00244224043308816086, 1.00183367638381182196, 1.00118183928085957568, 1.00048709102352662015, 0.99974972135593276334, 0.99896997270341103548, 0.99814796427552920921, 0.99728399409176327062, 0.99637830057770848668, 0.99543118752610437738, 0.99444288206981523714, 0.99341362814469125198, 0.99234366416931152344, 0.99123334776443938754, 0.99008285775281978935, 0.9888924921585291461, 0.98766255646024792014, 0.98639327440864366103, 0.98508501084419164417, 0.9837380637858240684, 0.98235261205219326364, 0.98092901327392945099, 0.97946763390632163304, 0.97796863534059386147, 0.97643244340462043152, 0.97485929651499114712, 0.97324955230000087525, 0.97160350878784718098, 0.96992147413719043136, 0.96820378592550404573, 0.96645069248717863086, 0.96466261105322259617, 0.96283983964497987795, 0.96098267629203060203, 0.95909148999586346651, 0.95716661584474982405, 0.95520830342453788564, 0.95321702957153320312]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_pW_X.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_pW_X.txt
deleted file mode 100644
index 24206fac..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_pW_X.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-X=[0., 0.00999000038929278265, 0.01998000077858556531, 0.02997000023655577161, 0.03996000155717113062, 0.04994999915435928417, 0.05994000047311154322, 0.06993000179558944707, 0.07992000311433893056, 0.08990999698997294287, 0.0998999983087213439, 0.10988999962746971717, 0.11988000094621809044, 0.12987000226498424116, 0.13986000359117889413, 0.14984999001625673443, 0.15984000622866453845, 0.1698299926537379656, 0.17981999397991924039, 0.18980999529123693259, 0.19979999661745379003, 0.20979001282986156629, 0.21977999925494387523, 0.22977000058113852821, 0.2397600018924561649, 0.24975000321865081787, 0.25974000452996848232, 0.26972999096987892997, 0.27972000718235778827, 0.28970999359251420335, 0.29969998003260228669, 0.3096899962449035093, 0.3196800124573823676, 0.32966999889729281525, 0.33965998530750257656, 0.34965000151992808863, 0.35963998795983848078, 0.36963000417231739458, 0.37961999058247386518, 0.38961000679495277899, 0.39959999323486317113, 0.40959000944734197391, 0.41958002565962543295, 0.42956998229751547358, 0.43955999850988775046, 0.44955001472236660875, 0.45954000116227705641, 0.4695299875724334715, 0.47952000378491232979, 0.48950999022482277745, 0.49950000643730163574, 0.50949002264963849651, 0.51948000905965308061, 0.52947005507345978881, 0.53945998194007727111, 0.54944996835009174418, 0.5594400143646800494, 0.56943000077476546572, 0.57941998718478004982, 0.58941003319943929828, 0.5993999600652041293, 0.60939000607986348879, 0.61937999248987796186, 0.62936997889989254595, 0.63936002491455179442, 0.64935001132456637851, 0.65933999779497598492, 0.669329984204990458, 0.67931997061500504209, 0.68931001662973523381, 0.69930000303967876363, 0.70929004905369852363, 0.71927997592010295413, 0.72926996233011742721, 0.73926000834477678669, 0.74924999475479125977, 0.75923998116480573284, 0.76923002717946509232, 0.7792200135894795654, 0.78921000005988928283, 0.7991999864699037559, 0.80918997287991834, 0.81918001889457747744, 0.82917000530459206153, 0.83916005131846971299, 0.84914997818501614102, 0.85913996459503072511, 0.86913001060968997358, 0.87911999701970455767, 0.88911004303393748049, 0.89910002944437839023, 0.90908995631014322125, 0.91908000232480246972, 0.92906998873481705381, 0.93905997514490247013, 0.94905002115949077535, 0.95904000756950524842, 0.96902999403991496585, 0.97901998044992943893, 0.98900996686022812909, 0.99900001287460327148]
-XInv=[0., 0.00999000038929278265, 0.01998000077858556531, 0.02997000023655577161, 0.03996000155717113062, 0.04994999915435928417, 0.05994000047311154322, 0.06993000179558944707, 0.07992000311433893056, 0.08990999698997294287, 0.0998999983087213439, 0.10988999962746971717, 0.11988000094621809044, 0.12987000226498424116, 0.13986000359117889413, 0.14984999001625673443, 0.15984000622866453845, 0.1698299926537379656, 0.17981999397991924039, 0.18980999529123693259, 0.19979999661745379003, 0.20979001282986156629, 0.21977999925494387523, 0.22977000058113852821, 0.2397600018924561649, 0.24975000321865081787, 0.25974000452996848232, 0.26972999096987892997, 0.27972000718235778827, 0.28970999359251420335, 0.29969998003260228669, 0.3096899962449035093, 0.3196800124573823676, 0.32966999889729281525, 0.33965998530750257656, 0.34965000151992808863, 0.35963998795983848078, 0.36963000417231739458, 0.37961999058247386518, 0.38961000679495277899, 0.39959999323486317113, 0.40959000944734197391, 0.41958002565962543295, 0.42956998229751547358, 0.43955999850988775046, 0.44955001472236660875, 0.45954000116227705641, 0.4695299875724334715, 0.47952000378491232979, 0.48950999022482277745, 0.49950000643730163574, 0.50949002264963849651, 0.51948000905965308061, 0.52947005507345978881, 0.53945998194007727111, 0.54944996835009174418, 0.5594400143646800494, 0.56943000077476546572, 0.57941998718478004982, 0.58941003319943929828, 0.5993999600652041293, 0.60939000607986348879, 0.61937999248987796186, 0.62936997889989254595, 0.63936002491455179442, 0.64935001132456637851, 0.65933999779497598492, 0.669329984204990458, 0.67931997061500504209, 0.68931001662973523381, 0.69930000303967876363, 0.70929004905369852363, 0.71927997592010295413, 0.72926996233011742721, 0.73926000834477678669, 0.74924999475479125977, 0.75923998116480573284, 0.76923002717946509232, 0.7792200135894795654, 0.78921000005988928283, 0.7991999864699037559, 0.80918997287991834, 0.81918001889457747744, 0.82917000530459206153, 0.83916005131846971299, 0.84914997818501614102, 0.85913996459503072511, 0.86913001060968997358, 0.87911999701970455767, 0.88911004303393748049, 0.89910002944437839023, 0.90908995631014322125, 0.91908000232480246972, 0.92906998873481705381, 0.93905997514490247013, 0.94905002115949077535, 0.95904000756950524842, 0.96902999403991496585, 0.97901998044992943893, 0.98900996686022812909, 0.99900001287460327148]
-time=[0., 1.]
-p_w=[0., 1617.62112964511243262677, 3215.83478772888292951393, 4794.98789810242033126997, 6355.42006039727766619762, 7897.46131143250113382237, 9421.43574982114296290092, 10927.65913500780698086601, 12416.43874092893747729249, 13888.0756480053660197882, 15342.8669717137254338013, 16781.09774139017463312484, 18203.04920693386884522624, 19608.99871275997793418355, 20999.21085500827030045912, 22373.95035611956700449809, 23733.47509235325196641497, 25078.0349168842876679264, 26407.87600611854213639162, 27723.24054593436812865548, 29024.35898891809847555123, 30311.46763531914984923787, 31584.78726019074383657426, 32844.53853913095372263342, 34090.93816436925408197567, 35324.1953125, 36544.52459395815094467252, 37752.11589729721890762448, 38947.17563937959494069219, 40129.89941832037584390491, 41300.46736030655301874503, 42459.07784989718493307009, 43605.90706527813017601147, 44741.1313299119719886221, 45864.93319346604403108358, 46977.48112789221340790391, 48078.93593063150910893455, 49169.47604455531109124422, 50249.25441807591414544731, 51318.43120794621790992096, 52377.15562141674308804795, 53425.59412276343209668994, 54463.88416613503795815632, 55492.17504860329790972173, 56510.61742891695030266419, 57519.34494560621533310041, 58518.49135691561968997121, 59508.20324231613631127402, 60488.61042093366268090904, 61459.83892097883654059842, 62422.0234375, 63375.28606026952184038237, 64319.74788517452543601394, 65255.5339125502941897139, 66182.7636426296376157552, 67101.54578374125412665308, 68012.01540870686585549265, 68914.25845434733491856605, 69808.40773421434278134257, 70694.55699904075299855322, 71572.81822609335358720273, 72443.30344671993225347251, 73306.10896503874391783029, 74161.32853065861854702234, 75009.07151885896746534854, 75849.43949308971059508622, 76682.51344776300538796932, 77508.40487641558866016567, 78327.19472887796291615814, 79138.97675505341612733901, 79943.83689204290567431599, 80741.87670359297771938145, 81533.16180624160915613174, 82317.79538349351787474006, 83095.85863546788459643722, 83867.421875, 84632.5788510840357048437, 85391.40769017285492736846, 86143.97870498994598165154, 86890.37340369356388691813, 87630.67099538071488495916, 88364.93732550516142509878, 89093.25833088399667758495, 89815.69651228393195196986, 90532.32218281552195549011, 91243.20143560944416094571, 91948.42086941216257400811, 92648.03091746759309899062, 93342.10970438459480646998, 94030.7119178866851143539, 94713.90787112576072104275, 95391.75604032559203915298, 96064.32700605349964462221, 96731.67921166741871275008, 97393.87515714408073108643, 98050.96171719006088096648, 98703.01701771345688030124, 99350.08409183616458903998, 99992.22534144500968977809, 100629.49939409179205540568, 101261.953125]
-dX=[0., 0., 0.00000000000000000347, -0.00000000000000000347, 0.00000000000000000694, -0., 0.00000000000000002082, 0., 0.00000000000000001388, -0., 0., -0.00000000000000001388, -0.00000000000000001388, 0.00000000000000002776, 0., 0.00000000000000002776, 0.00000000000000002776, 0., 0.00000000000000002776, -0.00000000000000002776, 0., 0., 0.00000000000000002776, -0.00000000000000002776, -0., -0.00000000000000002776, 0., 0., 0., -0., 0., -0.00000000000000005551, 0.00000000000000005551, 0.00000000000000005551, 0., 0., -0., 0., -0.00000000000000016653, -0.00000000000000011102, 0.00000000000000005551, -0., -0., 0., 0., 0., 0.00000000000000005551, -0.00000000000000005551, 0.00000000000000005551, 0.00000000000000005551, -0.00000000000000005551, 0., 0., -0.00000000000000011102, 0.00000000000000011102, 0., 0.00000000000000011102, 0., 0.00000000000000011102, -0.00000000000000011102, 0.00000000000000011102, 0., 0., 0.00000000000000011102, 0.00000000000000011102, -0.00000000000000011102, 0.00000000000000011102, 0., 0., -0.00000000000000011102, -0.00000000000000011102, -0., 0., 0., -0.00000000000000011102, -0.00000000000000011102, 0.00000000000000033307, 0., 0.00000000000000011102, -0.00000000000000022204, 0.00000000000000011102, -0.00000000000000011102, -0.00000000000000011102, -0.00000000000000011102, -0.00000000000000011102, -0.00000000000000011102, 0.00000000000000011102, -0.00000000000000011102, -0.00000000000000011102, 0.00000000000000011102, 0.00000000000000011102, 0.00000000000000011102, -0.00000000000000011102, 0., 0.00000000000000022204, 0.00000000000000011102, -0.00000000000000011102, 0.00000000000000022204, 0., -0.00000000000000022204, 0.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_Density_pTX.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_phi_pTX.txt
similarity index 65%
rename from BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_Density_pTX.txt
rename to BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_phi_pTX.txt
index c6ffb214..031a68c4 100644
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_Density_pTX.txt
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Psychrometrics_Functions_Examples_phi_pTX.txt
@@ -1,11 +1,6 @@
-last-generated=2015-11-05
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
T=[293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.24990854243355897779, 293.34979267109559941673, 293.44970731675374508995, 293.54959085032533039339, 293.64950549609255858741, 293.74938962464483438453, 293.84930427070383984756, 293.94918839922036113421, 294.04910304531506426429, 294.14898657848647189894, 294.24890122421737714831, 294.3487853528066580111, 294.44869999882860156504, 294.54861464470496912327, 294.64849877343982598177, 294.74841282382556073571, 294.84829695234213886579, 294.94821159843678515244, 295.04809572695404540355, 295.14801037286616747224, 295.24789450156458769925, 295.34780855195032245319, 295.44769268075793888784, 295.54760732656154686993, 295.647491455078125, 295.74740610117282813007, 295.84729022968934941673, 295.94720487578405254681, 296.04708840891908039339, 296.14700305468630858741, 296.24688718323858438453, 296.34680182929758984756, 296.44668595781411113421, 296.54660060390881426429, 296.64651465429454901823, 296.74639878281112714831, 296.84631342890577343496, 296.94619755742235156504, 297.04611220329871912327, 297.14599633203357598177, 297.24591038241931073571, 297.34579451093588886579, 297.44570915703053515244, 297.54559328554779540355, 297.64550793145991747224, 297.74539206015833769925, 297.84530611054407245319, 297.94519023935168888784, 298.04510488515529686993, 298.144989013671875]
time=[0., 1.]
X_w=[0., 0.00019999999941792255, 0.00039999999883584834, 0.00060000004190948614, 0.00079999999767169669, 0.00100000003259626599, 0.00120000008381899743, 0.0013999999441206422, 0.00159999999534337885, 0.00179999989755474151, 0.00200000006519258748, 0.0021999999999999971, 0.00240000016763773855, 0.00260000010244546128, 0.00279999988824136334, 0.00299999990686777027, 0.0031999999906867577, 0.00340000000931323446, 0.00359999979510989936, 0.00380000011175842022, 0.00400000013038482802, 0.00419999998137428072, 0.00439999999999985542, 0.00460000001862598523, 0.0048000003352754771, 0.00499999988824129105, 0.00520000020488981234, 0.00539999992549299555, 0.00559999977648272668, 0.00580000009313319, 0.00599999981373692832, 0.00620000013038489364, 0.00639999998137434807, 0.00659999970197836395, 0.00680000001862605258, 0.00700000033527540481, 0.00719999959021979871, 0.00739999990686832001, 0.00760000022351684044, 0.0078000000745074051, 0.00800000026076965604, 0.00820000011175910787, 0.00839999996274856144, 0.00860000014901081238, 0.00880000000000026594, 0.00899999985098972125, 0.00920000003725197045, 0.00939999988824142402, 0.0096000006705484562, 0.00979999992549312852, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209, 0.00999999977648258209]
-d=[1.20411312580108642578, 1.20396685599953023882, 1.20382046698871114643, 1.20367419718716828214, 1.20352792738562541786, 1.20338177682057256845, 1.20323562620103885479, 1.20308947563606594144, 1.20294332501661216384, 1.20279729371524979342, 1.2026512623050855666, 1.20250523089492133977, 1.20235919948491698506, 1.20221328728388265894, 1.20206737519180961726, 1.20192158230902612637, 1.20177578920863936673, 1.20162999632574951647, 1.20148420344264628135, 1.20133852955197539814, 1.20119285587830404438, 1.20104718198738447121, 1.20090150831396158537, 1.20075595384943745181, 1.20061039916819844997, 1.20046496391296386719, 1.20031940923172464331, 1.20017397419320537288, 1.20002865793054525057, 1.19988322245859557746, 1.19973790662936563578, 1.19959259036670573551, 1.19944739331333516397, 1.19930207748410522228, 1.19915699963981126075, 1.19901180258665385203, 1.19886672517515036063, 1.19872164733163777406, 1.19857656948784119244, 1.19843149164461282297, 1.19828653344204361098, 1.19814157480782057519, 1.19799673538288731223, 1.19785177718031810024, 1.19770693775538461523, 1.19756221753974090305, 1.19741737854646124184, 1.19727265833081730761, 1.19712793811581286185, 1.19698333754047303579, 1.19683873653411865234, 1.19643092116633154021, 1.19602358263456554077, 1.19561636331436305092, 1.19520950404607551043, 1.19480288077175234029, 1.1943964959160111583, 1.19399046868855895909, 1.19358467988082583844, 1.19317912949124527167, 1.19277393914533780261, 1.19236898480135256051, 1.19196426887736728339, 1.19155991058153509776, 1.19115579070456600874, 1.19075190924759710676, 1.19034826861350118143, 1.18994498320212760412, 1.18954193620890658067, 1.18913924684454608283, 1.1887366766901916737, 1.18833446416483967667, 1.18793249245354992638, 1.18753087597223006, 1.18712949791062594151, 1.18672835826873779297, 1.18632745704599718017, 1.18592691345112521972, 1.18552660827483236083, 1.18512654390322302866, 1.18472671556465680709, 1.18432724485382001589, 1.18392801256226709583, 1.18352901869029092374, 1.1831302632380307216, 1.18273186778581695933, 1.18233370837900975125, 1.18193578739049742765, 1.18153810482170085194, 1.18114077988105736772, 1.18074369335899298505, 1.18034684762157504601, 1.17995023793666864442, 1.17955398587920479159, 1.17915797224145424416, 1.178762197022714453, 1.17836666022383007579, 1.17797148340751300921, 1.1775765426532289748, 1.17718184031922912247, 1.17678737640380859375]
+phi=[0., 0.01392299526753188431, 0.02784260610867648686, 0.04175883624872323702, 0.05567168196238361094, 0.06958114252179053993, 0.08348723687434836394, 0.09738994348343041341, 0.11128927270721418463, 0.12518523136570566812, 0.13907781036329167068, 0.15296702169699571972, 0.16685286536675114633, 0.18073532647152115715, 0.1946144244743751861, 0.20849013991691556225, 0.22236252327094224723, 0.23623150339110104978, 0.25009711585224059238, 0.26395941111094639586, 0.2778183180518136175, 0.29167387797759514179, 0.30552604959608964386, 0.31937485355548494992, 0.33322034028715125098, 0.34706246852874755859, 0.36090121992754287117, 0.37473659223256017281, 0.38856866790883143326, 0.40239737591592261712, 0.41622270485886542213, 0.4300447371433615551, 0.44386340175864219537, 0.45767868733961714067, 0.47149067623233814617, 0.4852992974559324213, 0.49910453967502826922, 0.51290648517583203869, 0.52670509280999144863, 0.54050036257750644353, 0.55429225338077503515, 0.56808084742541065104, 0.58186610360333079761, 0.59564804045159869261, 0.60942662090692367727, 0.62320186349560424688, 0.63697378678380034422, 0.65074235364992127906, 0.66450764225358072146, 0.67826955198230887145, 0.69202816486358642578, 0.68776279282822128103, 0.68352698475237028131, 0.67932050221745432506, 0.67514319121629784437, 0.67099470393275062463, 0.66687494614322251341, 0.66278356022295481509, 0.65872048656383763721, 0.65468542714041511044, 0.65067816733390271278, 0.64669848056131562508, 0.64274621197762027425, 0.63882106356200862862, 0.63492297570898326153, 0.63105159078726480448, 0.62720681242323939042, 0.62338835636483380664, 0.61959606679571910259, 0.61582976490236074341, 0.61208921226867529786, 0.60837423007574586986, 0.60468466142548693565, 0.60102028351650027549, 0.59738088000227484997, 0.59376627206802368164, 0.59017628090379137262, 0.58661078729460414127, 0.58306949321723799962, 0.57955230035044325021, 0.57605898795584742356, 0.57258939825537058521, 0.56914329283334441634, 0.56572061208221358086, 0.56232105797759257548, 0.55894453136278965388, 0.55559087278036123347, 0.55225986400685822542, 0.54895132622948317191, 0.54566508063387542116, 0.54240106761269024638, 0.53915906800393853526, 0.53593880474093136268, 0.53274029721476212629, 0.52956324740310833921, 0.52640759570252926292, 0.52327304408653640966, 0.52015961104884556043, 0.51706702105367685629, 0.51399517351496404327, 0.51094388961791992188]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Time_Examples_CalendarTime.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Time_Examples_CalendarTime.txt
deleted file mode 100644
index 066c4010..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Time_Examples_CalendarTime.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-last-generated=2016-08-24
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-calendarTime2016.year=[2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2016., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2017., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2018., 2019., 2019., 2019., 2019., 2019., 2019.]
-time=[0., 100000000.]
-calendarTime2016.month=[1., 1., 1., 2., 2., 2., 3., 3., 4., 4., 4., 5., 5., 5., 6., 6., 7., 7., 7., 8., 8., 8., 9., 9., 10., 10., 10., 11., 11., 12., 12., 12., 1., 1., 1., 2., 2., 3., 3., 3., 4., 4., 5., 5., 5., 6., 6., 6., 7., 7., 8., 8., 8., 9., 9., 9., 10., 10., 11., 11., 11., 12., 12., 12., 1., 1., 2., 2., 2., 3., 3., 4., 4., 4., 5., 5., 5., 6., 6., 7., 7., 7., 8., 8., 8., 9., 9., 10., 10., 10., 11., 11., 11., 12., 12., 1., 1., 1., 2., 2., 3.]
-calendarTime2016.day=[1., 12., 24., 4., 16., 27., 10., 22., 2., 14., 25., 7., 18., 30., 11., 22., 4., 15., 27., 7., 19., 31., 11., 23., 4., 16., 27., 8., 20., 1., 13., 24., 5., 16., 28., 9., 20., 4., 15., 27., 7., 19., 1., 12., 24., 4., 16., 27., 9., 21., 1., 13., 24., 5., 16., 28., 10., 21., 2., 13., 25., 7., 18., 30., 10., 22., 2., 14., 26., 9., 21., 1., 13., 24., 6., 18., 29., 10., 21., 3., 14., 26., 7., 18., 30., 10., 22., 3., 15., 27., 7., 19., 30., 12., 23., 4., 16., 27., 8., 19., 3.]
-calendarTime2016.hour=[0., 13., 3., 17., 7., 20., 10., 0., 14., 3., 17., 7., 21., 11., 0., 14., 4., 18., 7., 21., 11., 1., 15., 4., 18., 8., 22., 11., 1., 15., 5., 19., 8., 22., 12., 2., 15., 5., 19., 9., 23., 12., 2., 16., 6., 19., 9., 23., 13., 3., 16., 6., 20., 10., 23., 13., 3., 17., 7., 20., 10., 0., 14., 3., 17., 7., 21., 11., 0., 14., 4., 18., 7., 21., 11., 1., 15., 4., 18., 8., 22., 11., 1., 15., 5., 19., 8., 22., 12., 2., 15., 5., 19., 9., 23., 12., 2., 16., 6., 19., 9.]
-calendarTime2016.minute=[0., 46.6666681906406068947, 33.33333257242635028206, 20.0000007659881617883, 6.66666656964785087069, 53.33333333333333570181, 40.00000150911100860185, 26.66666591085639126391, 13.33333314310658757051, 60., 46.66666666666666429819, 33.33333482847108797387, 19.9999992492553815282, 6.666666476757495019, 53.33333185908524143315, 40.0000000152435433165, 26.66666627096963182453, 13.31693352508544947455, 60., 46.6829253406059478948, 33.33366668701172130795, 19.98366626739501938914, 6.66630092400038787304, 53.34905732352778784389, 40.00039849853515505629, 26.65040002441406130629, 13.33290050986284214218, 60., 46.66666740386832401555, 33.31713183587535098695, 19.999501028460656471, 6.68280117716379962189, 53.33333262690791087834, 39.98386746215820153338, 26.63386701965331937458, 13.34820713939894787359, 60., 46.65071697326368393988, 33.36467543826159953824, 20.01733367919921846578, 6.66733329772949190328, 53.31818320534446087322, 39.96733261108398238548, 26.68114290579381631119, 13.33406700897216801138, 60., 46.69811464705556858235, 33.35079928588866948758, 20.00080081176757929029, 6.65079988479614225838, 53.30357142857143060155, 40.014078406223738682, 26.66753262329101659134, 13.31753314590454095878, 60., 46.68224299077823502557, 33.33426803601297194746, 19.98426596056905779619, 6.63426647936788693727, 53.34782476010529705945, 40.00100006103515681843, 26.65099956512451129242, 13.36347961045831311822, 60., 46.66666525381582886212, 33.31773339843749681677, 19.96773289489745906167, 6.67994707431483458748, 53.27586272667194577934, 40.05119854736328477429, 26.70120007324218747158, 13.35119969177246090908, 60., 46.65137684673344153907, 33.30119854736328477429, 19.95120007324218747158, 6.72407421233162061469, 53.37499936421712476431, 40.03466751098633125139, 26.68466697692871036907, 13.33466659545898380657, 60., 46.63636294278231275712, 33.28466751098633125139, 19.93466697692871036907, 6.71813325500488289777, 53.36065698842533322477, 40.01813265991211210348, 26.66813418579101480077, 13.31813363647460946027, 60., 46.62162299628730011136, 33.38888822283063717578, 20.03888974870954342578, 6.70159986495971704556, 53.34677419354838434629, 40.00160125732421789735, 26.65159933471679565287, 13.30159981536865210217, 60., 46.666667938232421875]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Time_Examples_ModelTime.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Time_Examples_ModelTime.txt
new file mode 100644
index 00000000..7eb33960
--- /dev/null
+++ b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Time_Examples_ModelTime.txt
@@ -0,0 +1,4 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+modTim.y=[-1., -0.97999999999999998224, -0.95999999999999996447, -0.93999999999999994671, -0.92000000000000003997, -0.9000000000000000222, -0.88000000000000000444, -0.85999999999999998668, -0.83999999999999996891, -0.82000000000000006217, -0.80000000000000004441, -0.78000000000000002665, -0.76000000000000000888, -0.73999999999999999112, -0.71999999999999997335, -0.69999999999999995559, -0.67999999999999993783, -0.65999999999999992006, -0.64000000000000001332, -0.61999999999999999556, -0.5999999999999999778, -0.58000000000000007105, -0.56000000000000005329, -0.54000000000000003553, -0.52000000000000001776, -0.5, -0.47999999999999998224, -0.45999999999999996447, -0.43999999999999994671, -0.42000000000000003997, -0.4000000000000000222, -0.38000000000000000444, -0.35999999999999998668, -0.33999999999999996891, -0.31999999999999995115, -0.30000000000000004441, -0.28000000000000002665, -0.26000000000000000888, -0.23999999999999999112, -0.21999999999999997335, -0.19999999999999995559, -0.18000000000000004885, -0.16000000000000003109, -0.14000000000000001332, -0.11999999999999999556, -0.0999999999999999778, -0.07999999999999996003, -0.06000000000000005329, -0.04000000000000003553, -0.02000000000000001776, 0., 0.02000000000000001776, 0.04000000000000003553, 0.06000000000000005329, 0.08000000000000007105, 0.10000000000000008882, 0.12000000000000010658, 0.1399999999999999023, 0.15999999999999992006, 0.17999999999999993783, 0.19999999999999995559, 0.21999999999999997335, 0.23999999999999999112, 0.26000000000000000888, 0.28000000000000002665, 0.30000000000000004441, 0.32000000000000006217, 0.34000000000000007994, 0.3600000000000000977, 0.37999999999999989342, 0.39999999999999991118, 0.41999999999999992895, 0.43999999999999994671, 0.45999999999999996447, 0.47999999999999998224, 0.5, 0.52000000000000001776, 0.54000000000000003553, 0.56000000000000005329, 0.58000000000000007105, 0.60000000000000008882, 0.62000000000000010658, 0.6399999999999999023, 0.65999999999999992006, 0.67999999999999993783, 0.69999999999999995559, 0.71999999999999997335, 0.73999999999999999112, 0.76000000000000000888, 0.78000000000000002665, 0.80000000000000004441, 0.82000000000000006217, 0.84000000000000007994, 0.8600000000000000977, 0.87999999999999989342, 0.89999999999999991118, 0.91999999999999992895, 0.93999999999999994671, 0.95999999999999996447, 0.97999999999999998224, 1.]
+time=[-1., 1.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Time_Validation_CalendarTimeMonths.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Time_Validation_CalendarTimeMonths.txt
deleted file mode 100644
index 6aac2f40..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Time_Validation_CalendarTimeMonths.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2016-09-09
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-calTim.year=[2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015.]
-time=[172800., 345600.]
-calTim.month=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-calTim.day=[3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4.]
-calTim.weekDay=[6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7.]
-calTim.hour=[0., 0., 0., 1., 1., 2., 2., 3., 3., 4., 4., 5., 5., 6., 6., 7., 7., 8., 8., 9., 9., 10., 10., 11., 11., 11., 12., 12., 13., 13., 14., 14., 15., 15., 16., 16., 17., 17., 18., 18., 19., 19., 20., 20., 21., 21., 22., 22., 23., 23., 23., 0., 0., 1., 1., 2., 2., 3., 3., 4., 4., 5., 5., 6., 6., 7., 7., 8., 8., 9., 9., 10., 10., 11., 11., 11., 12., 12., 13., 13., 14., 14., 15., 15., 16., 16., 17., 17., 18., 18., 19., 19., 20., 20., 21., 21., 22., 22., 23., 23., 23.]
-calTim.minute=[0., 28.799999237060546875, 57.59999847412109375, 26.3999996185302734375, 55.200000762939453125, 24., 52.799999237060546875, 21.6000003814697265625, 50.40000152587890625, 19.200000762939453125, 48., 16.799999237060546875, 45.59999847412109375, 14.3999996185302734375, 43.200000762939453125, 12., 40.799999237060546875, 9.6000003814697265625, 38.40000152587890625, 7.19999980926513671875, 36., 4.80000019073486328125, 33.59999847412109375, 2.40000009536743164062, 31.200000762939453125, 60., 28.799999237060546875, 57.59999847412109375, 26.3999996185302734375, 55.200000762939453125, 24., 52.799999237060546875, 21.6000003814697265625, 50.40000152587890625, 19.200000762939453125, 48., 16.799999237060546875, 45.59999847412109375, 14.3999996185302734375, 43.200000762939453125, 12., 40.799999237060546875, 9.6000003814697265625, 38.40000152587890625, 7.19999980926513671875, 36., 4.80000019073486328125, 33.59999847412109375, 2.40000009536743164062, 31.200000762939453125, 60., 28.799999237060546875, 57.59999847412109375, 26.3999996185302734375, 55.200000762939453125, 24., 52.799999237060546875, 21.6000003814697265625, 50.40000152587890625, 19.200000762939453125, 48., 16.799999237060546875, 45.59999847412109375, 14.3999996185302734375, 43.200000762939453125, 12., 40.799999237060546875, 9.6000003814697265625, 38.40000152587890625, 7.19999980926513671875, 36., 4.80000019073486328125, 33.59999847412109375, 2.40000009536743164062, 31.200000762939453125, 60., 28.799999237060546875, 57.59999847412109375, 26.3999996185302734375, 55.200000762939453125, 24., 52.799999237060546875, 21.6000003814697265625, 50.40000152587890625, 19.200000762939453125, 48., 16.799999237060546875, 45.59999847412109375, 14.3999996185302734375, 43.200000762939453125, 12., 40.799999237060546875, 9.6000003814697265625, 38.40000152587890625, 7.19999980926513671875, 36., 4.80000019073486328125, 33.59999847412109375, 2.40000009536743164062, 31.200000762939453125, 60.]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Time_Validation_CalendarTimeMonthsMinus.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Time_Validation_CalendarTimeMonthsMinus.txt
deleted file mode 100644
index 1f0324b2..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Time_Validation_CalendarTimeMonthsMinus.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2016-09-14
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-calTim.year=[2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015.]
-time=[172799., 345599.]
-calTim.month=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-calTim.day=[2., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4.]
-calTim.weekDay=[5., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7.]
-calTim.hour=[23., 0., 0., 1., 1., 2., 2., 3., 3., 4., 4., 5., 5., 6., 6., 7., 7., 8., 8., 9., 9., 10., 10., 11., 11., 11., 12., 12., 13., 13., 14., 14., 15., 15., 16., 16., 17., 17., 18., 18., 19., 19., 20., 20., 21., 21., 22., 22., 23., 23., 23., 0., 0., 1., 1., 2., 2., 3., 3., 4., 4., 5., 5., 6., 6., 7., 7., 8., 8., 9., 9., 10., 10., 11., 11., 11., 12., 12., 13., 13., 14., 14., 15., 15., 16., 16., 17., 17., 18., 18., 19., 19., 20., 20., 21., 21., 22., 22., 23., 23., 23.]
-calTim.minute=[59.983333587646484375, 28.78333282470703125, 57.583332061767578125, 26.3833332061767578125, 55.1833343505859375, 23.983333587646484375, 52.78333282470703125, 21.5833339691162109375, 50.383335113525390625, 19.1833324432373046875, 47.983333587646484375, 16.78333282470703125, 45.583332061767578125, 14.3833332061767578125, 43.1833343505859375, 11.983333587646484375, 40.78333282470703125, 9.58333301544189453125, 38.383335113525390625, 7.18333339691162109375, 35.983333587646484375, 4.78333330154418945312, 33.583332061767578125, 2.38333344459533691406, 31.1833324432373046875, 59.983333587646484375, 28.78333282470703125, 57.583332061767578125, 26.3833332061767578125, 55.1833343505859375, 23.983333587646484375, 52.78333282470703125, 21.5833339691162109375, 50.383335113525390625, 19.1833324432373046875, 47.983333587646484375, 16.78333282470703125, 45.583332061767578125, 14.3833332061767578125, 43.1833343505859375, 11.983333587646484375, 40.78333282470703125, 9.58333301544189453125, 38.383335113525390625, 7.18333339691162109375, 35.983333587646484375, 4.78333330154418945312, 33.583332061767578125, 2.38333344459533691406, 31.1833324432373046875, 59.983333587646484375, 28.78333282470703125, 57.583332061767578125, 26.3833332061767578125, 55.1833343505859375, 23.983333587646484375, 52.78333282470703125, 21.5833339691162109375, 50.383335113525390625, 19.1833324432373046875, 47.983333587646484375, 16.78333282470703125, 45.583332061767578125, 14.3833332061767578125, 43.1833343505859375, 11.983333587646484375, 40.78333282470703125, 9.58333301544189453125, 38.383335113525390625, 7.18333339691162109375, 35.983333587646484375, 4.78333330154418945312, 33.583332061767578125, 2.38333344459533691406, 31.1833324432373046875, 59.983333587646484375, 28.78333282470703125, 57.583332061767578125, 26.3833332061767578125, 55.1833343505859375, 23.983333587646484375, 52.78333282470703125, 21.5833339691162109375, 50.383335113525390625, 19.1833324432373046875, 47.983333587646484375, 16.78333282470703125, 45.583332061767578125, 14.3833332061767578125, 43.1833343505859375, 11.983333587646484375, 40.78333282470703125, 9.58333301544189453125, 38.383335113525390625, 7.18333339691162109375, 35.983333587646484375, 4.78333330154418945312, 33.583332061767578125, 2.38333344459533691406, 31.1833324432373046875, 59.983333587646484375]
diff --git a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Time_Validation_CalendarTimeMonthsPlus.txt b/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Time_Validation_CalendarTimeMonthsPlus.txt
deleted file mode 100644
index 8ebcb0e0..00000000
--- a/BuildingSystems/Resources/ReferenceResults/Dymola/BuildingSystems_Utilities_Time_Validation_CalendarTimeMonthsPlus.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-last-generated=2016-09-14
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
-}
-calTim.year=[2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015., 2015.]
-time=[172801., 345601.]
-calTim.month=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]
-calTim.day=[3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 3., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 4., 5.]
-calTim.weekDay=[6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 6., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 7., 1.]
-calTim.hour=[0., 0., 0., 1., 1., 2., 2., 3., 3., 4., 4., 5., 5., 6., 6., 7., 7., 8., 8., 9., 9., 10., 10., 11., 11., 12., 12., 12., 13., 13., 14., 14., 15., 15., 16., 16., 17., 17., 18., 18., 19., 19., 20., 20., 21., 21., 22., 22., 23., 23., 0., 0., 0., 1., 1., 2., 2., 3., 3., 4., 4., 5., 5., 6., 6., 7., 7., 8., 8., 9., 9., 10., 10., 11., 11., 12., 12., 12., 13., 13., 14., 14., 15., 15., 16., 16., 17., 17., 18., 18., 19., 19., 20., 20., 21., 21., 22., 22., 23., 23., 0.]
-calTim.minute=[0.01666666753590106964, 28.8166675567626953125, 57.616664886474609375, 26.4166660308837890625, 55.21666717529296875, 24.016666412353515625, 52.8166656494140625, 21.6166667938232421875, 50.416667938232421875, 19.21666717529296875, 48.016666412353515625, 16.8166675567626953125, 45.616664886474609375, 14.41666698455810546875, 43.21666717529296875, 12.016666412353515625, 40.8166656494140625, 9.6166667938232421875, 38.416667938232421875, 7.21666669845581054688, 36.016666412353515625, 4.81666660308837890625, 33.616664886474609375, 2.41666674613952636719, 31.21666717529296875, 0.01666666753590106964, 28.8166675567626953125, 57.616664886474609375, 26.4166660308837890625, 55.21666717529296875, 24.016666412353515625, 52.8166656494140625, 21.6166667938232421875, 50.416667938232421875, 19.21666717529296875, 48.016666412353515625, 16.8166675567626953125, 45.616664886474609375, 14.41666698455810546875, 43.21666717529296875, 12.016666412353515625, 40.8166656494140625, 9.6166667938232421875, 38.416667938232421875, 7.21666669845581054688, 36.016666412353515625, 4.81666660308837890625, 33.616664886474609375, 2.41666674613952636719, 31.21666717529296875, 0.01666666753590106964, 28.8166675567626953125, 57.616664886474609375, 26.4166660308837890625, 55.21666717529296875, 24.016666412353515625, 52.8166656494140625, 21.6166667938232421875, 50.416667938232421875, 19.21666717529296875, 48.016666412353515625, 16.8166675567626953125, 45.616664886474609375, 14.41666698455810546875, 43.21666717529296875, 12.016666412353515625, 40.8166656494140625, 9.6166667938232421875, 38.416667938232421875, 7.21666669845581054688, 36.016666412353515625, 4.81666660308837890625, 33.616664886474609375, 2.41666674613952636719, 31.21666717529296875, 0.01666666753590106964, 28.8166675567626953125, 57.616664886474609375, 26.4166660308837890625, 55.21666717529296875, 24.016666412353515625, 52.8166656494140625, 21.6166667938232421875, 50.416667938232421875, 19.21666717529296875, 48.016666412353515625, 16.8166675567626953125, 45.616664886474609375, 14.41666698455810546875, 43.21666717529296875, 12.016666412353515625, 40.8166656494140625, 9.6166667938232421875, 38.416667938232421875, 7.21666669845581054688, 36.016666412353515625, 4.81666660308837890625, 33.616664886474609375, 2.41666674613952636719, 31.21666717529296875, 0.01666666753590106964]
diff --git a/BuildingSystems/Resources/ReferenceResults/HeatingSystems/SolarHeatingSystem.mos b/BuildingSystems/Resources/ReferenceResults/HeatingSystems/SolarHeatingSystem.mos
deleted file mode 100644
index e078c1f4..00000000
--- a/BuildingSystems/Resources/ReferenceResults/HeatingSystems/SolarHeatingSystem.mos
+++ /dev/null
@@ -1,30 +0,0 @@
-simulateModel("BuildingSystems.Applications.HeatingSystems.SolarHeatingSystem", stopTime=31536000, method="dassl", resultFile="SolarHeatingSystem");
-removePlots();
-createPlot(
- id = 1,
- position = {0, 0, 600, 500},
- y = {"ambient.TAirRef","building.zone.TAir","building.zone.TOperative"},
- autoscale = true,
- autoerase = true,
- autoreplot = true,
- description = false,
- grid = true,
- color = true,
- online = false,
- filename = "SolarHeatingSystem.mat",
- leftTitleType = 1,
- bottomTitleType = 1);
-createPlot(
- id = 2,
- position = {600, 0, 600, 500},
- y = {"rad.Q_flow"},
- autoscale = true,
- autoerase = true,
- autoreplot = true,
- description = false,
- grid = true,
- color = true,
- online = false,
- filename = "SolarHeatingSystem.mat",
- leftTitleType = 1,
- bottomTitleType = 1);
diff --git a/BuildingSystems/Resources/ReferenceResults/HeatingSystems/WaterHeatingSystem.mos b/BuildingSystems/Resources/ReferenceResults/HeatingSystems/WaterHeatingSystem.mos
deleted file mode 100644
index c1d81271..00000000
--- a/BuildingSystems/Resources/ReferenceResults/HeatingSystems/WaterHeatingSystem.mos
+++ /dev/null
@@ -1,30 +0,0 @@
-simulateModel("BuildingSystems.Applications.HeatingSystems.WaterHeatingSystem", stopTime=864000, method="dassl", resultFile="WaterHeatingSystem");
-removePlots();
-createPlot(
- id = 1,
- position = {0, 0, 600, 500},
- y = {"ambient.TAirRef","building.zone.TAir","building.zone.TOperative"},
- autoscale = true,
- autoerase = true,
- autoreplot = true,
- description = false,
- grid = true,
- color = true,
- online = false,
- filename = "WaterHeatingSystem.mat",
- leftTitleType = 1,
- bottomTitleType = 1);
-createPlot(
- id = 2,
- position = {600, 0, 600, 500},
- y = {"rad.Q_flow"},
- autoscale = true,
- autoerase = true,
- autoreplot = true,
- description = false,
- grid = true,
- color = true,
- online = false,
- filename = "WaterHeatingSystem.mat",
- leftTitleType = 1,
- bottomTitleType = 1);