diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Chillers_ModularReversible_Validation_ConstantCarnotEffectiveness.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Chillers_ModularReversible_Validation_ConstantCarnotEffectiveness.txt
index 143f5a200d..4c0ba86f14 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Chillers_ModularReversible_Validation_ConstantCarnotEffectiveness.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Chillers_ModularReversible_Validation_ConstantCarnotEffectiveness.txt
@@ -17,5 +17,4 @@ chi.refCyc.PEle=[1.4122759765625e+04, 1.4122759765625e+04, 1.4122759765625e+04,
 chi.dp1=[6e+03, 6e+03]
 chi.dp2=[6e+03, 6e+03]
 chi.refCyc.refCycChiCoo.EER_nominal=[2.124230861663818e+00, 2.124230861663818e+00]
-chi.refCyc.refCycChiCoo.reaEtaCarEff.y=[2.755671262741089e+00, 2.601786375045776e+00, 2.534570693969727e+00, 2.38344669342041e+00, 2.230450391769409e+00, 2.167744159698486e+00, 2.142425775527954e+00, 2.131905078887939e+00, 2.127480268478394e+00, 2.125609397888184e+00, 2.124817132949829e+00, 2.124480009078979e+00, 2.124336719512939e+00, 2.124275922775269e+00, 2.124249935150146e+00, 2.124239206314087e+00, 2.124234437942505e+00, 2.124232292175293e+00, 2.124231576919556e+00, 2.124231100082397e+00, 2.124230861663818e+00, 2.124230861663818e+00, 2.124230623245239e+00, 2.124230623245239e+00, 2.124230623245239e+00, 2.124230623245239e+00, 2.204912900924683e+00, 2.38360619544983e+00, 2.491180181503296e+00, 2.535692691802979e+00, 2.553391456604004e+00, 2.560320854187012e+00, 2.563015937805176e+00, 2.564061164855957e+00, 2.564467668533325e+00, 2.564625978469849e+00, 2.564687490463257e+00, 2.564711570739746e+00, 2.564720392227173e+00, 2.564723968505859e+00, 2.564725637435913e+00, 2.56472635269165e+00, 2.564726591110229e+00, 2.564726591110229e+00, 2.564726829528809e+00, 2.564726829528809e+00, 2.564727067947388e+00, 2.564727067947388e+00, 2.564727067947388e+00, 2.564726829528809e+00, 2.564726829528809e+00, 3.104876279830933e+00, 4.929102897644043e+00, 7.366550445556641e+00, 1.005235671997072e+01, 1.254013538360597e+01, 1.450024795532228e+01, 1.585688781738281e+01, 1.67138614654541e+01, 1.724864768981934e+01, 1.759150886535645e+01, 1.775021171569824e+01, 1.782098960876465e+01, 1.785423851013184e+01, 1.787051963806152e+01, 1.787896728515625e+01, 1.788361167907715e+01, 1.788606452941895e+01, 1.788736534118652e+01, 1.788812065124512e+01, 1.788858795166016e+01, 1.788888359069824e+01, 1.78890209197998e+01, 1.788902854919434e+01, 1.788899993896484e+01, 1.788898849487305e+01, 1.788899993896484e+01, 1.788900947570801e+01, 1.788900756835938e+01, 1.788899803161621e+01, 1.788896942138672e+01, 1.788895416259766e+01, 1.788891983032227e+01, 1.788891983032227e+01, 1.7888916015625e+01, 1.788893890380859e+01, 1.788896179199219e+01, 1.788898277282715e+01, 1.788899803161621e+01, 1.788900756835938e+01, 1.788901710510254e+01, 1.78890209197998e+01, 1.788901710510254e+01, 1.788901901245117e+01, 1.788901519775391e+01, 1.788901138305664e+01, 1.788900756835938e+01, 1.788900566101074e+01, 1.788900184631348e+01, 1.788899993896484e+01, 1.788899993896484e+01]
 chi.refCyc.sigBus.EER=[2.755671262741089e+00, 2.601786375045776e+00, 2.534570693969727e+00, 2.38344669342041e+00, 2.230450391769409e+00, 2.167744159698486e+00, 2.142425775527954e+00, 2.131905078887939e+00, 2.127480268478394e+00, 2.125609397888184e+00, 2.124817132949829e+00, 2.124480009078979e+00, 2.124336719512939e+00, 2.124275922775269e+00, 2.124249935150146e+00, 2.124239206314087e+00, 2.124234437942505e+00, 2.124232292175293e+00, 2.124231576919556e+00, 2.124231100082397e+00, 2.124230861663818e+00, 2.124230861663818e+00, 2.124230623245239e+00, 2.124230623245239e+00, 2.124230623245239e+00, 2.124230623245239e+00, 2.204912900924683e+00, 2.38360619544983e+00, 2.491180181503296e+00, 2.535692691802979e+00, 2.553391456604004e+00, 2.560320854187012e+00, 2.563015937805176e+00, 2.564061164855957e+00, 2.564467668533325e+00, 2.564625978469849e+00, 2.564687490463257e+00, 2.564711570739746e+00, 2.564720392227173e+00, 2.564723968505859e+00, 2.564725637435913e+00, 2.56472635269165e+00, 2.564726591110229e+00, 2.564726591110229e+00, 2.564726829528809e+00, 2.564726829528809e+00, 2.564727067947388e+00, 2.564727067947388e+00, 2.564727067947388e+00, 2.564726829528809e+00, 2.564726829528809e+00, 3.104876279830933e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 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/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Validation_Comparative_ConstantCarnotEffectiveness.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Validation_Comparative_ConstantCarnotEffectiveness.txt
index 37a6e2b4ff..0db92e1cb8 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Validation_Comparative_ConstantCarnotEffectiveness.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Validation_Comparative_ConstantCarnotEffectiveness.txt
@@ -17,5 +17,4 @@ heaPum.refCyc.PEle=[1.23750595703125e+04, 1.23750595703125e+04, 1.23750595703125
 heaPum.dp1=[6e+03, 6e+03]
 heaPum.dp2=[6e+03, 6e+03]
 heaPum.refCyc.refCycHeaPumHea.COP_nominal=[2.424230813980103e+00, 2.424230813980103e+00]
-heaPum.refCyc.refCycHeaPumHea.reaEtaCarEff.y=[3.022756576538086e+00, 2.841303110122681e+00, 2.772667646408081e+00, 2.637427091598511e+00, 2.504878282546997e+00, 2.454448699951172e+00, 2.435764312744141e+00, 2.428664922714233e+00, 2.425941228866577e+00, 2.424896478652954e+00, 2.424487590789795e+00, 2.424330711364746e+00, 2.424269199371338e+00, 2.424245595932007e+00, 2.424236059188843e+00, 2.424232721328735e+00, 2.42423152923584e+00, 2.424231052398682e+00, 2.424230813980103e+00, 2.424230813980103e+00, 2.424230575561523e+00, 2.424230575561523e+00, 2.424230575561523e+00, 2.424230813980103e+00, 2.424230813980103e+00, 2.424230813980103e+00, 2.499832391738892e+00, 2.659942865371705e+00, 2.747552394866943e+00, 2.77983832359314e+00, 2.791336297988892e+00, 2.795384168624878e+00, 2.796802520751953e+00, 2.797298669815063e+00, 2.797469854354858e+00, 2.797532320022583e+00, 2.797554731369019e+00, 2.797562837600708e+00, 2.797565698623657e+00, 2.797566413879395e+00, 2.797566890716553e+00, 2.797567129135132e+00, 2.797567129135132e+00, 2.797566890716553e+00, 2.797566652297974e+00, 2.797566652297974e+00, 2.797566652297974e+00, 2.797567129135132e+00, 2.797567367553711e+00, 2.797567367553711e+00, 2.797567367553711e+00, 3.30132269859314e+00, 5.076691627502441e+00, 7.483390331268311e+00, 1.016668033599855e+01, 1.268203163146974e+01, 1.46842384338379e+01, 1.608078575134277e+01, 1.696709251403809e+01, 1.751661682128906e+01, 1.787639427185059e+01, 1.804411315917969e+01, 1.81184253692627e+01, 1.815301704406738e+01, 1.817011070251465e+01, 1.817884063720703e+01, 1.818339729309082e+01, 1.818592834472656e+01, 1.818734359741211e+01, 1.818808174133301e+01, 1.818848419189453e+01, 1.8188720703125e+01, 1.818885040283203e+01, 1.818891334533691e+01, 1.818894386291504e+01, 1.81889591217041e+01, 1.81889705657959e+01, 1.818898010253906e+01, 1.818898963928223e+01, 1.818899536132812e+01, 1.818899726867676e+01, 1.818899726867676e+01, 1.818899536132812e+01, 1.818899154663086e+01, 1.818899345397949e+01, 1.818899154663086e+01, 1.818899154663086e+01, 1.818899345397949e+01, 1.818899726867676e+01, 1.818899917602539e+01, 1.818900108337402e+01, 1.818900680541992e+01, 1.818901062011719e+01, 1.818901062011719e+01, 1.818900871276855e+01, 1.818901062011719e+01, 1.818901252746582e+01, 1.818901252746582e+01, 1.818901062011719e+01, 1.818900871276855e+01, 1.818900680541992e+01]
 heaPum.refCyc.sigBus.COP=[3.022756576538086e+00, 2.841303110122681e+00, 2.772667646408081e+00, 2.637427091598511e+00, 2.504878282546997e+00, 2.454448699951172e+00, 2.435764312744141e+00, 2.428664922714233e+00, 2.425941228866577e+00, 2.424896478652954e+00, 2.424487590789795e+00, 2.424330711364746e+00, 2.424269199371338e+00, 2.424245595932007e+00, 2.424236059188843e+00, 2.424232721328735e+00, 2.42423152923584e+00, 2.424231052398682e+00, 2.424230813980103e+00, 2.424230813980103e+00, 2.424230575561523e+00, 2.424230575561523e+00, 2.424230575561523e+00, 2.424230813980103e+00, 2.424230813980103e+00, 2.424230813980103e+00, 2.499832391738892e+00, 2.659942865371705e+00, 2.747552394866943e+00, 2.77983832359314e+00, 2.791336297988892e+00, 2.795384168624878e+00, 2.796802520751953e+00, 2.797298669815063e+00, 2.797469854354858e+00, 2.797532320022583e+00, 2.797554731369019e+00, 2.797562837600708e+00, 2.797565698623657e+00, 2.797566413879395e+00, 2.797566890716553e+00, 2.797567129135132e+00, 2.797567129135132e+00, 2.797566890716553e+00, 2.797566652297974e+00, 2.797566652297974e+00, 2.797566652297974e+00, 2.797567129135132e+00, 2.797567367553711e+00, 2.797567367553711e+00, 2.797567367553711e+00, 3.30132269859314e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 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/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/ConstantCarnotEffectiveness.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/ConstantCarnotEffectiveness.mos
index d132005595..ae5d353162 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/ConstantCarnotEffectiveness.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/ConstantCarnotEffectiveness.mos
@@ -2,4 +2,4 @@ simulateModel("IBPSA.Fluid.Chillers.ModularReversible.Validation.ConstantCarnotE
 createPlot(id=2, position={75, 70, 1210, 980}, y={"chi.refCyc.sigBus.TConInMea", "chi.refCyc.sigBus.TConOutMea", "chi.refCyc.sigBus.TEvaInMea", "chi.refCyc.sigBus.TEvaOutMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="Chiller_ConstantCarnotEffectiveness.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
 createPlot(id=2, position={75, 70, 1210, 240}, y={"chi.refCyc.QEva_flow", "chi.refCyc.QCon_flow", "chi.refCyc.PEle"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={75, 70, 1210, 241}, y={"chi.dp1", "chi.dp2"}, range={0.0, 3600.0, 0.0, 14000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
-createPlot(id=2, position={75, 70, 1210, 240}, y={"chi.refCyc.refCycChiCoo.EER_nominal", "chi.refCyc.refCycChiCoo.reaEtaCarEff.y", "chi.refCyc.sigBus.EER"}, range={0.0, 3600.0, 3.0, 10.0}, grid=true, subPlot=4, colors={{28,108,200}, {0,140,72}, {238,46,47}});
+createPlot(id=2, position={75, 70, 1210, 240}, y={"chi.refCyc.refCycChiCoo.EER_nominal", "chi.refCyc.sigBus.EER"}, range={0.0, 3600.0, 3.0, 10.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}});
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/ConstantCarnotEffectiveness.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/ConstantCarnotEffectiveness.mos
index 1ecfbee24b..05dcab8c4d 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/ConstantCarnotEffectiveness.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/ConstantCarnotEffectiveness.mos
@@ -2,4 +2,4 @@ simulateModel("IBPSA.Fluid.HeatPumps.ModularReversible.Validation.Comparative.Co
 createPlot(id=2, position={75, 70, 1210, 980}, y={"heaPum.refCyc.sigBus.TConInMea", "heaPum.refCyc.sigBus.TConOutMea", "heaPum.refCyc.sigBus.TEvaInMea", "heaPum.refCyc.sigBus.TEvaOutMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="HeatPump_ConstantCarnotEffectiveness.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
 createPlot(id=2, position={75, 70, 1210, 240}, y={"heaPum.refCyc.QEva_flow", "heaPum.refCyc.QCon_flow", "heaPum.refCyc.PEle"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={75, 70, 1210, 241}, y={"heaPum.dp1", "heaPum.dp2"}, range={0.0, 3600.0, 0.0, 14000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
-createPlot(id=2, position={75, 70, 1210, 240}, y={"heaPum.refCyc.refCycHeaPumHea.COP_nominal", "heaPum.refCyc.refCycHeaPumHea.reaEtaCarEff.y", "heaPum.refCyc.sigBus.COP"}, range={0.0, 3600.0, 3.0, 10.0}, grid=true, subPlot=4, colors={{28,108,200}, {0,140,72}, {238,46,47}});
+createPlot(id=2, position={75, 70, 1210, 240}, y={"heaPum.refCyc.refCycHeaPumHea.COP_nominal", "heaPum.refCyc.sigBus.COP"}, range={0.0, 3600.0, 3.0, 10.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}});