Further worked on FMI container for #27.

ibpsa · Jan 28, 2014 · 0eb70aa · 0eb70aa
1 parent b13e1a0
commit 0eb70aa
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/Annex60/Fluid/FMI/BaseClasses/Inlet.mo b/Annex60/Fluid/FMI/BaseClasses/Inlet.mo
@@ -29,7 +29,8 @@ equation
   port.Xi_outflow = inlet.Xi_outflow;
   port.C_outflow  = inlet.C_outflow;
 
-  p = port.p;
+  // Send inlet pressure to signal port p
+  p = inlet.p;
 
   annotation (defaultComponentName="boundary",
     Icon(coordinateSystem(

diff --git a/Annex60/Fluid/FMI/BaseClasses/Outlet.mo b/Annex60/Fluid/FMI/BaseClasses/Outlet.mo
@@ -21,7 +21,11 @@ model Outlet "Model for exposing a fluid outlet to the FMI interface"
         rotation=90,
         origin={0,-120})));
 equation
-  port.p          = outlet.p;
+  // Set outlet pressure and port pressure to pressure
+  // of signal port
+  outlet.p        = p;
+  port.p          = p;
+
   port.m_flow     = outlet.m_flow;
   port.h_outflow  = outlet.h_outflow;
   port.Xi_outflow = outlet.Xi_outflow;

diff --git a/Annex60/Fluid/FMI/Fixme.mo b/Annex60/Fluid/FMI/Fixme.mo
@@ -1,7 +1,8 @@
 within Annex60.Fluid.FMI;
 block Fixme
-   extends Annex60.Fluid.FMI.TwoPortSingleComponent(redeclare
-      HeatExchangers.HeaterCoolerPrescribed partialTwoPort(
+   extends Annex60.Fluid.FMI.TwoPortSingleComponent(
+     redeclare package Medium = Annex60.Media.Water,
+     redeclare HeatExchangers.HeaterCoolerPrescribed partialTwoPort(
       m_flow_nominal=m_flow_nominal,
       dp_nominal=dp_nominal,
       Q_flow_nominal=Q_flow_nominal));

diff --git a/Annex60/Fluid/FMI/TwoPortSingleComponent.mo b/Annex60/Fluid/FMI/TwoPortSingleComponent.mo
@@ -4,24 +4,25 @@ block TwoPortSingleComponent
   extends TwoPort;
   replaceable Modelica.Fluid.Interfaces.PartialTwoPort partialTwoPort
     constrainedby Modelica.Fluid.Interfaces.PartialTwoPort(
-      redeclare final package Medium = Medium,
+      redeclare package Medium = Medium,
       final allowFlowReversal=allowFlowReversal)
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
   parameter Boolean allowFlowReversal = true
     "= true to allow flow reversal, false restricts to design direction (port_a -> port_b)"
     annotation(Dialog(tab="Assumptions"), Evaluate=true);
+  Modelica.Blocks.Math.Feedback pOut "Pressure at component outlet"
+    annotation (Placement(transformation(extent={{10,-70},{30,-50}})));
+
 protected
   BaseClasses.Inlet bouIn(redeclare final package Medium=Medium)
     "Boundary model for inlet"
     annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
   BaseClasses.Outlet bouOut(redeclare final package Medium=Medium)
     "Boundary component for outlet"
     annotation (Placement(transformation(extent={{60,-10},{80,10}})));
-public
+
   Sensors.RelativePressure senRelPre(redeclare package Medium = Medium)
     annotation (Placement(transformation(extent={{-10,-44},{10,-24}})));
-  Modelica.Blocks.Math.Feedback pOut "Pressure at component outlet"
-    annotation (Placement(transformation(extent={{10,-70},{30,-50}})));
 equation
   connect(inlet, bouIn.inlet) annotation (Line(
       points={{-110,0},{-81,0}},