Skip to content
Closed
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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 @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

### Fixed <!--Make sure to add a link to the PR and issues related to your change-->
- Fixed [#99](https://github.com/Metroscope-dev/metroscope-modeling-library/issues/99) in [#278](https://github.com/Metroscope-dev/metroscope-modeling-library/pull/278), by adding a `not_used` effort variable to power inlets and outlets. Local balance is ensured by defining `C_in(not_used = 0)` in all power inlets. ⚠️ This fix works only because we have not several power inlets in one power connection set.
- Fixed [#273](https://github.com/Metroscope-dev/metroscope-modeling-library/issues/273), steam extraction splitter'`x` are lower than 1 [PR#275](https://github.com/Metroscope-dev/metroscope-modeling-library/pull/275)
- Fixed `IsoHFlowModel` and `IsoPHFlowModel` now use `h_0` as `h` start value with [PR #265]([url](https://github.com/Metroscope-dev/metroscope-modeling-library/pull/265))
- Fixed `NTU HX` test configuration name for `shell_and_tubes` test, [PR #239](https://github.com/Metroscope-dev/metroscope-modeling-library/pull/239)
Expand Down
2 changes: 1 addition & 1 deletion MetroscopeModelingLibrary/Partial/Machines/Pump.mo
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ partial model Pump
extent={{-20,-20},{20,20}},
rotation=90,
origin={0,-120})));
Power.Connectors.Inlet C_power "Electrical alimentation of the pump" annotation (Placement(transformation(
Power.Connectors.Inlet C_power(not_used = 0) "Electrical alimentation of the pump" annotation (Placement(transformation(
extent={{-12,-12},{12,12}},
rotation=-90,
origin={0,108}), iconTransformation(
Expand Down
3 changes: 2 additions & 1 deletion MetroscopeModelingLibrary/Power/BoundaryConditions/Sink.mo
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
within MetroscopeModelingLibrary.Power.BoundaryConditions;
model Sink
extends MetroscopeModelingLibrary.Icons.BoundaryConditions.PowerSinkIcon;
import MetroscopeModelingLibrary.Units.Inputs;

Units.PositivePower W_in;
Connectors.Inlet C_in annotation (Placement(transformation(extent={{-60,-10},{-40,10}}), iconTransformation(extent={{-60,-10},{-40,10}})));
Connectors.Inlet C_in(not_used = 0) annotation (Placement(transformation(extent={{-60,-10},{-40,10}}), iconTransformation(extent={{-60,-10},{-40,10}})));
equation
W_in = C_in.W;
end Sink;
4 changes: 3 additions & 1 deletion MetroscopeModelingLibrary/Power/BoundaryConditions/Source.mo
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
within MetroscopeModelingLibrary.Power.BoundaryConditions;
model Source
extends MetroscopeModelingLibrary.Icons.BoundaryConditions.PowerSourceIcon;
import MetroscopeModelingLibrary.Units.Inputs;

Inputs.InputNotUsed not_used; // To keep local balance of the Power.Sink, since we cannot define 'not_used = 0' here
Units.NegativePower W_out;
Connectors.Outlet C_out annotation (Placement(transformation(extent={{38,-10},{58,10}}), iconTransformation(extent={{38,-10},{58,10}})));
Connectors.Outlet C_out(not_used = not_used) annotation (Placement(transformation(extent={{38,-10},{58,10}}), iconTransformation(extent={{38,-10},{58,10}})));
equation
W_out = C_out.W;
end Source;
1 change: 1 addition & 0 deletions MetroscopeModelingLibrary/Power/Connectors/Inlet.mo
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ connector Inlet
import MetroscopeModelingLibrary.Units;

flow Units.PositivePower W;
Units.NotUsed not_used "not used effort variable to balance the connector";
end Inlet;
1 change: 1 addition & 0 deletions MetroscopeModelingLibrary/Power/Connectors/Outlet.mo
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ connector Outlet
import MetroscopeModelingLibrary.Units;

flow Units.NegativePower W;
Units.NotUsed not_used "not used effort variable to balance the connector";
end Outlet;
2 changes: 1 addition & 1 deletion MetroscopeModelingLibrary/Power/Machines/Generator.mo
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ model Generator
Units.NegativePower W_elec "Electrical power produced by the generator";
Units.PositivePower W_mech "Mechanical power received by the generator";

Connectors.Inlet C_in annotation (Placement(transformation(extent={{-72,-10},{-52,10}}), iconTransformation(extent={{-72,-10},{-52,10}})));
Connectors.Inlet C_in(not_used = 0) annotation (Placement(transformation(extent={{-72,-10},{-52,10}}), iconTransformation(extent={{-72,-10},{-52,10}})));
Connectors.Outlet C_out annotation (Placement(transformation(extent={{60,-10},{80,10}}), iconTransformation(extent={{60,-10},{80,10}})));
equation
W_mech = C_in.W;
Expand Down
2 changes: 1 addition & 1 deletion MetroscopeModelingLibrary/Sensors/Power/PowerSensor.mo
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ model PowerSensor
Units.Power W; // Power in W
Real W_MW(min=0, nominal=100, start=100); // Power in MW

MetroscopeModelingLibrary.Power.Connectors.Inlet C_in annotation (Placement(transformation(extent={{-110,-10},{-90,10}}), iconTransformation(extent={{-110,-10},{-90,10}})));
MetroscopeModelingLibrary.Power.Connectors.Inlet C_in(not_used = 0) annotation (Placement(transformation(extent={{-110,-10},{-90,10}}), iconTransformation(extent={{-110,-10},{-90,10}})));
MetroscopeModelingLibrary.Power.Connectors.Outlet C_out annotation (Placement(transformation(extent={{88,-10},{108,10}}), iconTransformation(extent={{88,-10},{108,10}})));
equation
// Conservation of power
Expand Down
2 changes: 2 additions & 0 deletions MetroscopeModelingLibrary/Units/Inputs/InputNotUsed.mo
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
within MetroscopeModelingLibrary.Units.Inputs;
connector InputNotUsed = input Units.NotUsed;
1 change: 1 addition & 0 deletions MetroscopeModelingLibrary/Units/Inputs/package.order
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ InputPositiveVolumeFlowRate
InputNegativeVolumeFlowRate
InputTemperature
InputYield
InputNotUsed
2 changes: 2 additions & 0 deletions MetroscopeModelingLibrary/Units/NotUsed.mo
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
within MetroscopeModelingLibrary.Units;
type NotUsed = Real "For Non used variables, needed in power connector for local balance";
1 change: 1 addition & 0 deletions MetroscopeModelingLibrary/Units/package.order
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ VolumeFlowRate
PositiveVolumeFlowRate
NegativeVolumeFlowRate
Yield
NotUsed