Merge pull request #153 from iea-annex60/issue147_moversRecord

Issue147 movers record. This closes #147
ibpsa · Mar 6, 2015 · 9c945a7 · 9c945a7
2 parents fea0c39 + d09bbdd
commit 9c945a7
Show file tree

Hide file tree

Showing 100 changed files with 3,016 additions and 1,034 deletions.
diff --git a/Annex60/Fluid/HeatExchangers/Examples/BaseClasses/Heater.mo b/Annex60/Fluid/HeatExchangers/Examples/BaseClasses/Heater.mo
@@ -27,7 +27,7 @@ partial model Heater "Base class for example model for the heater and cooler"
   Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor TVol
     "Sensor for volume temperature"
     annotation (Placement(transformation(extent={{20,-10},{0,10}})));
-  Annex60.Fluid.Movers.FlowMachine_m_flow fan(
+  Annex60.Fluid.Movers.FlowControlled_m_flow fan(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
     addPowerToMedium=false,