Skip to content

Commit

Permalink
Merge pull request #178 from iea-annex60/issue177_moverNrpm
Browse files Browse the repository at this point in the history
Issue177 moverNrpm
  • Loading branch information
mwetter committed Mar 7, 2015
2 parents d373ed0 + f8442c6 commit 183576b
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions Annex60/Fluid/Movers/SpeedControlled_Nrpm.mo
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ model SpeedControlled_Nrpm
motorCooledByFluid=per.motorCooledByFluid,
use_powerCharacteristic=per.use_powerCharacteristic));

parameter Data.SpeedControlled_Nrpm per "Record with performance data"
replaceable parameter Data.SpeedControlled_Nrpm per
"Record with performance data"
annotation (choicesAllMatching=true,
Placement(transformation(extent={{60,-80},{80,-60}})));
Placement(transformation(extent={{20,-80},{40,-60}})));

Modelica.Blocks.Interfaces.RealInput Nrpm(unit="1/min")
"Prescribed rotational speed"
Expand Down Expand Up @@ -84,6 +85,11 @@ User's Guide</a> for more information.
revisions="<html>
<ul>
<li>
March 6, 2015, by Michael Wetter<br/>
Made performance record <code>per</code> replaceable
as for the other models.
</li>
<li>
January 6, 2015, by Michael Wetter:<br/>
Revised model for OpenModelica.
</li>
Expand Down

0 comments on commit 183576b

Please sign in to comment.