RWTH-EBC · DaJansenGit · May 6, 2021 · May 21, 2021 · May 31, 2021 · May 31, 2021
diff --git a/AixLib/Controls/Interfaces/BoilerControlBus.mo b/AixLib/Controls/Interfaces/BoilerControlBus.mo
@@ -6,8 +6,18 @@ expandable connector BoilerControlBus
 Boolean isOn "Switches Controller on and off";
 Modelica.SIunits.Temperature TAmbient "Ambient air temperature";
 Boolean switchToNightMode "Switches the boiler to night mode";
-Modelica.SIunits.Power chemicalEnergyFlowRate
- "Flow of primary (chemical) energy into boiler";
+Modelica.SIunits.Power chemicalEnergyFlowRate "Flow of primary (chemical) energy into boiler";
+
+
+// BoilerNotManufacturer
+Real PLR "Part load ratio";
+Modelica.SIunits.TemperatureDifference DeltaTWater "Setpoint temperature difference heat circuit";
+Modelica.SIunits.Temperature TCold "Sensor output TCold";
+Modelica.SIunits.Temperature THot "Sensor output THot";
+Modelica.SIunits.Power EnergyDemand "Energy Demand";
+
+
+
 
  annotation (
  Icon(coordinateSystem(preserveAspectRatio=false)),

diff --git a/AixLib/Controls/Interfaces/CHPControlBus.mo b/AixLib/Controls/Interfaces/CHPControlBus.mo
@@ -148,6 +148,19 @@ expandable connector CHPControlBus
  "= false to use a prescibed heating circuit mass flow, = true to use a prescribed volume flow"
  annotation (Dialog(tab="Operation point", group="CHP Unit"));
 
+ // Definition of variables describing CHPNotManufacturer
+ //
+ Real PLR "Partload ratio of electric Power";
+ Modelica.SIunits.Energy ElectricEnergy
+ "Produced electric energy"
+ annotation(Dialog(tab="NotManufacturer"));
+ Modelica.SIunits.Energy EnergyConsumption
+ "Energy consumption"
+ annotation(Dialog(tab="NotManufacturer"));
+ Modelica.SIunits.Temperature TVolume
+ "temperature cooling water exhaust heat exchanger exit";
+Modelica.SIunits.Temperature TCold "Sensor output TCold";
+Modelica.SIunits.Temperature THot "Sensor output THot";
  annotation (Documentation(revisions="<html><ul>
  <li>January, 2019, by Julian Matthes:<br/>
  First implementation (see <a href=

diff --git a/AixLib/Controls/Interfaces/GeneralModularConnector.mo b/AixLib/Controls/Interfaces/GeneralModularConnector.mo
@@ -0,0 +1,19 @@
+within AixLib.Controls.Interfaces;
+expandable connector GeneralModularConnector
+ "Connector for modular models without manufacturer data"
+
+ extends Modelica.Icons.SignalBus;
+
+ Real PLR "Part load Ration; depends on the System";
+
+ Modelica.SIunits.ThermodynamicTemperature TSource "temperautre of Heat Source for a Heat Pump";
+
+ Real DeltaTWater "Water temperature difference as a result of controlling";
+
+
+
+
+
+ annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+ coordinateSystem(preserveAspectRatio=false)));
+end GeneralModularConnector;
diff --git a/AixLib/Controls/Interfaces/ThermalMachineControlBus.mo b/AixLib/Controls/Interfaces/ThermalMachineControlBus.mo
@@ -17,8 +17,16 @@ Modelica.SIunits.ThermodynamicTemperature T_ret_ev "temperature of flow out of e
 
 Modelica.SIunits.ThermodynamicTemperature T_ret_co "temperature of flow out of condenser";
 
+Modelica.SIunits.ThermodynamicTemperature TSource "temperature of heat source";
+
 Modelica.SIunits.Power Pel "Total electrical active power";
 
+Real QRel "Part load ratio";
+
+Real PLR "Part load ratio compressor";
+
+Boolean Shutdown "true: force shutdown";
+
 Modelica.SIunits.MassFlowRate m_flow_ev "Mass flow rate through evaporator";
 
 Modelica.SIunits.MassFlowRate m_flow_co "Mass flow rate through condenser";
@@ -44,4 +52,7 @@ annotation (
 <p>First implementation. </p>
 </html>"));
 
+
+ Modelica.SIunits.Power QEvapNom "Nominal evaporation heat flow";
+
 end ThermalMachineControlBus;
diff --git a/AixLib/Controls/Interfaces/package.order b/AixLib/Controls/Interfaces/package.order
@@ -6,3 +6,4 @@ ModularExpansionValveControlBus
 ModularHeatPumpControlBus
 ModularSensorControlBus
 ThermalMachineControlBus
+GeneralModularConnector
diff --git a/AixLib/DataBase/Boiler/EtaTExhaust.mo b/AixLib/DataBase/Boiler/EtaTExhaust.mo
@@ -0,0 +1,116 @@
+within AixLib.DataBase.Boiler;
+package EtaTExhaust
+ record EtaTExhaustBaseDataDefinition
+ extends Modelica.Icons.Record;
+ //refering to upper heating value
+ parameter Real[:,2] EtaTable "Efficiency";
+ annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+ coordinateSystem(preserveAspectRatio=false)));
+ end EtaTExhaustBaseDataDefinition;
+
+ record Ambient1
+ extends EtaTExhaustBaseDataDefinition(EtaTable=[25, 0.999376053;
+ 26, 0.997883234;
+ 27, 0.996332192;
+ 28, 0.99472041;
+ 29, 0.99304529;
+ 30, 0.991304146;
+ 31, 0.989494209;
+ 32, 0.987612622;
+ 33, 0.985656439;
+ 34, 0.983622622;
+ 35, 0.981508042;
+ 36, 0.979309475;
+ 37, 0.977023602;
+ 38, 0.974647004;
+ 39, 0.972176168;
+ 40, 0.969607474;
+ 41, 0.966937205;
+ 42, 0.964161536;
+ 43, 0.961276538;
+ 44, 0.958278175;
+ 45, 0.955162299;
+ 46, 0.951924655;
+ 47, 0.948560872;
+ 48, 0.945066468;
+ 49, 0.941436842;
+ 50, 0.937667277;
+ 51, 0.933752937;
+ 52, 0.929688864;
+ 53, 0.925469978;
+ 54, 0.921091075;
+ 55, 0.916546824;
+ 56, 0.911831768;
+ 57, 0.90694032;
+ 58, 0.90186676;
+ 59, 0.899194625;
+ 60, 0.89864209;
+ 61, 0.898089556;
+ 62, 0.897537021;
+ 63, 0.896984487;
+ 64, 0.896431952;
+ 65, 0.895879418;
+ 66, 0.895326884;
+ 67, 0.894774349;
+ 68, 0.894221815;
+ 69, 0.89366928;
+ 70, 0.893116746;
+ 71, 0.892564211;
+ 72, 0.892011677;
+ 73, 0.891459142;
+ 74, 0.890906608;
+ 75, 0.890354073;
+ 76, 0.889801539;
+ 77, 0.889249004;
+ 78, 0.88869647;
+ 79, 0.888143935;
+ 80, 0.887591401;
+ 81, 0.887038866;
+ 82, 0.886486332;
+ 83, 0.885933797;
+ 84, 0.885381263;
+ 85, 0.884828728;
+ 86, 0.884276194;
+ 87, 0.883723659;
+ 88, 0.883171125;
+ 89, 0.88261859;
+ 90, 0.882066056;
+ 91, 0.881513521;
+ 92, 0.880960987;
+ 93, 0.880408452;
+ 94, 0.879855918;
+ 95, 0.879303383;
+ 96, 0.878750849;
+ 97, 0.878198314;
+ 98, 0.87764578;
+ 99, 0.877093245;
+ 100, 0.876540711;
+ 101, 0.875988176;
+ 102, 0.875435642;
+ 103, 0.874883107;
+ 104, 0.874330573;
+ 105, 0.873778039;
+ 106, 0.873225504;
+ 107, 0.87267297;
+ 108, 0.872120435;
+ 109, 0.871567901;
+ 110, 0.871015366;
+ 111, 0.870462832;
+ 112, 0.869910297;
+ 113, 0.869357763;
+ 114, 0.868805228;
+ 115, 0.868252694;
+ 116, 0.867700159;
+ 117, 0.867147625;
+ 118, 0.86659509;
+ 119, 0.866042556;
+ 120, 0.865490021;
+ 121, 0.864937487;
+ 122, 0.864384952;
+ 123, 0.863832418;
+ 124, 0.863279883;
+ 125, 0.862727349])
+ annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+ coordinateSystem(preserveAspectRatio=false)));
+ end Ambient1;
+end EtaTExhaust;
diff --git a/AixLib/DataBase/Boiler/package.order b/AixLib/DataBase/Boiler/package.order
@@ -1,3 +1,4 @@
 DayNightMode
 General
 WorkLoad
+EtaTExhaust
diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/package.order b/AixLib/DataBase/Pumps/PumpPolynomialBased/package.order
@@ -24,4 +24,3 @@ Pump_DN65_H15
 Pump_DN65_H1_12_V48
 Pump_DN65_H1_16_V26
 Pump_DN65_H1_17
-