Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Use [gitmoji](https://gitmoji.dev/) to identify your changes.

### ✨ Added <!--Make sure to add a link to the PR and issues related to your change-->
- Added fixed speed pump [#526](https://github.com/Metroscope-dev/metroscope-modeling-library/pull/526)
- (Breaking change) Added opening connector to IGV component [#527](https://github.com/Metroscope-dev/metroscope-modeling-library/pull/527)

### 🐛 Fixed <!--Make sure to add a link to the PR and issues related to your change-->

Expand Down
3 changes: 3 additions & 0 deletions MetroscopeModelingLibrary/Examples/CCGT/GasTurbine_direct.mo
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,15 @@ model GasTurbine_direct
FlueGases.Machines.InletGuideVanes inletGuideVanes annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
Sensors.FlueGases.FlowSensor air_massflowrate_sensor(sensor_function="Calibration", causality="compressor_Qv_in = f(IGV_angle)")
annotation (Placement(transformation(extent={{-132,-10},{-112,10}})));
Sensors.Outline.OpeningSensor IGV_angle_sensor(sensor_function="BC") annotation (Placement(transformation(extent={{-110,32},{-90,52}})));
equation

// Boundary Conditions
source_air.P_out = source_P;
source_air.h_out = source_h;
source_air.Xi_out = {0.768,0.232,0.0,0.0,0.0};
turbine_P_out_sensor.P_barA = turbine_P_out;
IGV_angle_sensor.Opening = IGV_angle;

source_fuel.P_out = P_fuel;
source_fuel.h_out = h_fuel;
Expand Down Expand Up @@ -107,6 +109,7 @@ equation
connect(inletGuideVanes.C_out, air_compressor.C_in) annotation (Line(points={{-95,0},{-84,0}}, color={95,95,95}));
connect(source_air.C_out, air_massflowrate_sensor.C_in) annotation (Line(points={{-139,0},{-132,0}}, color={95,95,95}));
connect(air_massflowrate_sensor.C_out, inletGuideVanes.C_in) annotation (Line(points={{-112,0},{-105,0}}, color={95,95,95}));
connect(IGV_angle_sensor.Opening, inletGuideVanes.Opening) annotation (Line(points={{-100,31.8},{-100,8}}, color={0,0,127}));
annotation (
Diagram(coordinateSystem(
preserveAspectRatio=false,
Expand Down
3 changes: 3 additions & 0 deletions MetroscopeModelingLibrary/Examples/CCGT/GasTurbine_reverse.mo
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,15 @@ model GasTurbine_reverse
FlueGases.Machines.InletGuideVanes inletGuideVanes annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
Sensors.FlueGases.FlowSensor air_massflowrate_sensor(sensor_function="Calibration", causality="compressor_Qv_in = f(IGV_angle)")
annotation (Placement(transformation(extent={{-132,-10},{-112,10}})));
Sensors.Outline.OpeningSensor IGV_angle_sensor(sensor_function="BC") annotation (Placement(transformation(extent={{-110,32},{-90,52}})));
equation

// Boundary Conditions
source_air.P_out = source_P;
source_air.h_out = source_h;
source_air.Xi_out = {0.768,0.232,0.0,0.0,0.0};
turbine_P_out_sensor.P_barA = turbine_P_out;
IGV_angle_sensor.Opening = IGV_angle;

source_fuel.P_out = P_fuel;
source_fuel.h_out = h_fuel;
Expand Down Expand Up @@ -106,6 +108,7 @@ equation
connect(inletGuideVanes.C_out, air_compressor.C_in) annotation (Line(points={{-95,0},{-84,0}}, color={95,95,95}));
connect(source_air.C_out, air_massflowrate_sensor.C_in) annotation (Line(points={{-139,0},{-132,0}}, color={95,95,95}));
connect(air_massflowrate_sensor.C_out, inletGuideVanes.C_in) annotation (Line(points={{-112,0},{-105,0}}, color={95,95,95}));
connect(IGV_angle_sensor.Opening, inletGuideVanes.Opening) annotation (Line(points={{-100,31.8},{-100,8}}, color={0,0,127}));
annotation (
Diagram(coordinateSystem(
preserveAspectRatio=false,
Expand Down
11 changes: 11 additions & 0 deletions MetroscopeModelingLibrary/FlueGases/Machines/InletGuideVanes.mo
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,17 @@ model InletGuideVanes
BaseClasses.IsoPHFlowModel isoPHFlowModel annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
Connectors.Inlet C_in annotation (Placement(transformation(extent={{-60,-10},{-40,10}}), iconTransformation(extent={{-60,-10},{-40,10}})));
Connectors.Outlet C_out annotation (Placement(transformation(extent={{40,-10},{60,10}}), iconTransformation(extent={{40,-10},{60,10}})));
Modelica.Blocks.Interfaces.RealInput Opening(
unit="1",
min=0.,
max=1.,
nominal=0.5) annotation (Placement(
transformation(extent={{-20,-20},{20,20}},
rotation=270,
origin={0,80}), iconTransformation(
extent={{-20,-20},{20,20}},
rotation=-90,
origin={0,80})));
equation

Qv = isoPHFlowModel.Qv_in;
Expand Down