Changeset 530

Show
Ignore:
Timestamp:
08/13/07 08:17:21 (16 months ago)
Author:
AHaumer
Message:

improved documentation, removed type TemperatureDifference

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • Modelica/branches/maintenance/2.2.1/Modelica/Thermal/FluidHeatFlow.mo

    r482 r530  
    22  "Simple components for 1-dimensional incompressible thermo-fluid flow models"  
    33  extends Modelica.Icons.Library2; 
    4   type TemperatureDifference = Real ( 
    5     final quantity="TemperatureDifference", 
    6     final unit="K", 
    7     displayUnit="K"); 
    84  annotation ( 
    9     version="1.6.0 Beta", versionDate="2007-01-23", 
     5    version="1.6.1", versionDate="2007-08-12", 
    106    preferedView="info",Documentation(info="<HTML> 
    117<p> 
    … …  
    113109  <li> v1.60 2007/01/23 Anton Haumer<br> 
    114110       new parameter tapT defining Temperature of heatPort </li> 
     111  <li> v1.6.1 2007/08/12 Anton Haumer<br> 
     112       improved documentation<br> 
     113       removed type TemperatureDifference since this is defined in Modelica.SIunits</li> 
    115114  </ul> 
    116115</HTML> 
    … …  
    208207            fillPattern=1)))); 
    209208     
    210     model SimpleCooling  
     209    model SimpleCooling "Example: simple cooling circuit"  
    211210      extends Modelica.Icons.Example; 
    212211    annotation (Documentation(info="<HTML> 
    … …  
    248247        experimentSetupOutput); 
    249248      parameter FluidHeatFlow.Media.Medium medium=FluidHeatFlow.Media.Medium()  
     249        "Cooling medium"  
    250250        annotation(choicesAllMatching=true); 
    251251      parameter Modelica.SIunits.CelsiusTemperature TAmb=20  
    252         "ambient temperature"; 
    253       output TemperatureDifference dTSource= 
     252        "Ambient temperature"; 
     253      output Modelica.SIunits.TemperatureDifference dTSource= 
    254254        PrescribedHeatFlow1.port.T-Modelica.SIunits.Conversions.from_degC(TAmb)  
    255255        "Source over Ambient"; 
    256       output TemperatureDifference dTtoPipe=PrescribedHeatFlow1.port.T-Pipe1.heatPort.T  
     256      output Modelica.SIunits.TemperatureDifference dTtoPipe=PrescribedHeatFlow1.port.T-Pipe1.heatPort.T  
    257257        "Source over Coolant"; 
    258       output TemperatureDifference dTCoolant=Pipe1.dT  
     258      output Modelica.SIunits.TemperatureDifference dTCoolant=Pipe1.dT  
    259259        "Coolant's temperature increase"; 
    260260      FluidHeatFlow.Sources.Ambient Ambient1(T_Ambient=Modelica.SIunits.Conversions.from_degC(TAmb), 
    … …  
    310310    end SimpleCooling; 
    311311     
    312     model ParallelCooling  
     312    model ParallelCooling "Example: coolig circuit with parallel branches"  
    313313      extends Modelica.Icons.Example; 
    314314    annotation (Documentation(info="<HTML> 
    … …  
    374374        experimentSetupOutput); 
    375375      parameter FluidHeatFlow.Media.Medium medium=FluidHeatFlow.Media.Medium()  
     376        "Cooling medium"  
    376377        annotation(choicesAllMatching=true); 
    377378      parameter Modelica.SIunits.CelsiusTemperature TAmb=20  
    378         "ambient temperature"; 
    379       output TemperatureDifference dTSource1= 
     379        "Ambient temperature"; 
     380      output Modelica.SIunits.TemperatureDifference dTSource1= 
    380381        PrescribedHeatFlow1.port.T-Modelica.SIunits.Conversions.from_degC(TAmb)  
    381382        "Source1 over Ambient"; 
    382       output TemperatureDifference dTtoPipe1=PrescribedHeatFlow1.port.T-Pipe1.heatPort.T  
     383      output Modelica.SIunits.TemperatureDifference dTtoPipe1=PrescribedHeatFlow1.port.T-Pipe1.heatPort.T  
    383384        "Source1 over Coolant1"; 
    384       output TemperatureDifference dTCoolant1=Pipe1.dT  
     385      output Modelica.SIunits.TemperatureDifference dTCoolant1=Pipe1.dT  
    385386        "Coolant1's temperature increase"; 
    386       output TemperatureDifference dTSource2= 
     387      output Modelica.SIunits.TemperatureDifference dTSource2= 
    387388        PrescribedHeatFlow2.port.T-Modelica.SIunits.Conversions.from_degC(TAmb)  
    388389        "Source2 over Ambient"; 
    389       output TemperatureDifference dTtoPipe2=PrescribedHeatFlow2.port.T-Pipe2.heatPort.T  
     390      output Modelica.SIunits.TemperatureDifference dTtoPipe2=PrescribedHeatFlow2.port.T-Pipe2.heatPort.T  
    390391        "Source2 over Coolant2"; 
    391       output TemperatureDifference dTCoolant2=Pipe2.dT  
     392      output Modelica.SIunits.TemperatureDifference dTCoolant2=Pipe2.dT  
    392393        "Coolant2's temperature increase"; 
    393       output TemperatureDifference dTmixedCoolant=Ambient2.T_port-Ambient1.T_port  
     394      output Modelica.SIunits.TemperatureDifference dTmixedCoolant=Ambient2.T_port-Ambient1.T_port  
    394395        "mixed Coolant's temperature increase"; 
    395396      FluidHeatFlow.Sources.Ambient Ambient1(T_Ambient=Modelica.SIunits.Conversions.from_degC(TAmb), 
    … …  
    479480    end ParallelCooling; 
    480481     
    481     model IndirectCooling  
     482    model IndirectCooling "Example: indirect cooling circuit"  
    482483      extends Modelica.Icons.Example; 
    483484    annotation (Documentation(info="<HTML> 
    … …  
    532533        experimentSetupOutput); 
    533534      parameter FluidHeatFlow.Media.Medium outerMedium=FluidHeatFlow.Media.Medium()  
     535        "Outer medium"  
    534536        annotation(choicesAllMatching=true); 
    535537      parameter FluidHeatFlow.Media.Medium innerMedium=FluidHeatFlow.Media.Medium()  
     538        "Inner medium"  
    536539        annotation(choicesAllMatching=true); 
    537540      parameter Modelica.SIunits.CelsiusTemperature TAmb=20  
    538         "ambient temperature"; 
    539       output TemperatureDifference dTSource= 
     541        "Ambient temperature"; 
     542      output Modelica.SIunits.TemperatureDifference dTSource= 
    540543        PrescribedHeatFlow1.port.T-Modelica.SIunits.Conversions.from_degC(TAmb)  
    541544        "Source over Ambient"; 
    542       output TemperatureDifference dTtoPipe=PrescribedHeatFlow1.port.T-Pipe1.heatPort.T  
     545      output Modelica.SIunits.TemperatureDifference dTtoPipe=PrescribedHeatFlow1.port.T-Pipe1.heatPort.T  
    543546        "Source over inner Coolant"; 
    544       output TemperatureDifference dTinnerCoolant=Pipe1.dT  
     547      output Modelica.SIunits.TemperatureDifference dTinnerCoolant=Pipe1.dT  
    545548        "inner Coolant's temperature increase"; 
    546       output TemperatureDifference dTCooler=innerPipe.heatPort.T-outerPipe.heatPort.T  
     549      output Modelica.SIunits.TemperatureDifference dTCooler=innerPipe.heatPort.T-outerPipe.heatPort.T  
    547550        "Cooler's temperature increase between inner and outer pipes"; 
    548       output TemperatureDifference dTouterCoolant=outerPipe.dT  
     551      output Modelica.SIunits.TemperatureDifference dTouterCoolant=outerPipe.dT  
    549552        "outer Coolant's temperature increase"; 
    550553      FluidHeatFlow.Sources.Ambient Ambient1(T_Ambient=Modelica.SIunits.Conversions.from_degC(TAmb), 
    … …  
    647650    end IndirectCooling; 
    648651     
    649     model PumpAndValve  
     652    model PumpAndValve "Example: cooling circuit with pump and valve"  
    650653      extends Modelica.Icons.Example; 
    651654    annotation (Documentation(info="<HTML> 
    … …  
    671674        experimentSetupOutput); 
    672675      parameter FluidHeatFlow.Media.Medium medium=FluidHeatFlow.Media.Medium()  
     676        "Cooling medium"  
    673677        annotation(choicesAllMatching=true); 
    674678      parameter Modelica.SIunits.CelsiusTemperature TAmb=20  
    675         "ambient temperature"; 
    676       output TemperatureDifference dTSource= 
     679        "Ambient temperature"; 
     680      output Modelica.SIunits.TemperatureDifference dTSource= 
    677681        PrescribedHeatFlow1.port.T-Modelica.SIunits.Conversions.from_degC(TAmb)  
    678682        "Source over Ambient"; 
    679       output TemperatureDifference dTtoPipe=PrescribedHeatFlow1.port.T-Pipe1.heatPort.T  
     683      output Modelica.SIunits.TemperatureDifference dTtoPipe=PrescribedHeatFlow1.port.T-Pipe1.heatPort.T  
    680684        "Source over Coolant"; 
    681       output TemperatureDifference dTCoolant=Pipe1.dT  
     685      output Modelica.SIunits.TemperatureDifference dTCoolant=Pipe1.dT  
    682686        "Coolant's temperature increase"; 
    683687      FluidHeatFlow.Sources.Ambient Ambient1(T_Ambient=Modelica.SIunits.Conversions.from_degC(TAmb), 
    … …  
    756760    end PumpAndValve; 
    757761     
    758     model PumpDropOut  
     762    model PumpDropOut "Example: cooling circuit with drop out of pump"  
    759763      extends Modelica.Icons.Example; 
    760764    annotation (Documentation(info="<HTML> 
    … …  
    771775        experimentSetupOutput); 
    772776      parameter FluidHeatFlow.Media.Medium medium=FluidHeatFlow.Media.Medium()  
     777        "Cooling medium"  
    773778        annotation(choicesAllMatching=true); 
    774779      parameter Modelica.SIunits.CelsiusTemperature TAmb=20  
    775         "ambient temperature"; 
    776       output TemperatureDifference dTSource= 
     780        "Ambient temperature"; 
     781      output Modelica.SIunits.TemperatureDifference dTSource= 
    777782        PrescribedHeatFlow1.port.T-Modelica.SIunits.Conversions.from_degC(TAmb)  
    778783        "Source over Ambient"; 
    779       output TemperatureDifference dTtoPipe=PrescribedHeatFlow1.port.T-Pipe1.heatPort.T  
     784      output Modelica.SIunits.TemperatureDifference dTtoPipe=PrescribedHeatFlow1.port.T-Pipe1.heatPort.T  
    780785        "Source over Coolant"; 
    781       output TemperatureDifference dTCoolant=Pipe1.dT  
     786      output Modelica.SIunits.TemperatureDifference dTCoolant=Pipe1.dT  
    782787        "Coolant's temperature increase"; 
    783788      FluidHeatFlow.Sources.Ambient Ambient1(T_Ambient=Modelica.SIunits.Conversions.from_degC(TAmb), 
    … …  
    837842     
    838843    model ParallelPumpDropOut  
     844      "Example: cooling circuit with parallel branches and drop out of pump"  
    839845      extends Modelica.Icons.Example; 
    840846    annotation (Documentation(info="<HTML> 
    … …  
    851857        experimentSetupOutput); 
    852858      parameter FluidHeatFlow.Media.Medium medium=FluidHeatFlow.Media.Medium()  
     859        "Cooling medium"  
    853860        annotation(choicesAllMatching=true); 
    854861      parameter Modelica.SIunits.CelsiusTemperature TAmb=20  
    855         "ambient temperature"; 
    856       output TemperatureDifference dTSource1= 
     862        "Ambient temperature"; 
     863      output Modelica.SIunits.TemperatureDifference dTSource1= 
    857864        PrescribedHeatFlow1.port.T-Modelica.SIunits.Conversions.from_degC(TAmb)  
    858865        "Source1 over Ambient"; 
    859       output TemperatureDifference dTtoPipe1=PrescribedHeatFlow1.port.T-Pipe1.heatPort.T  
     866      output Modelica.SIunits.TemperatureDifference dTtoPipe1=PrescribedHeatFlow1.port.T-Pipe1.heatPort.T  
    860867        "Source1 over Coolant1"; 
    861       output TemperatureDifference dTCoolant1=Pipe1.dT  
     868      output Modelica.SIunits.TemperatureDifference dTCoolant1=Pipe1.dT  
    862869        "Coolant1's temperature increase"; 
    863       output TemperatureDifference dTSource2= 
     870      output Modelica.SIunits.TemperatureDifference dTSource2= 
    864871        PrescribedHeatFlow2.port.T-Modelica.SIunits.Conversions.from_degC(TAmb)  
    865872        "Source2 over Ambient"; 
    866       output TemperatureDifference dTtoPipe2=PrescribedHeatFlow2.port.T-Pipe2.heatPort.T  
     873      output Modelica.SIunits.TemperatureDifference dTtoPipe2=PrescribedHeatFlow2.port.T-Pipe2.heatPort.T  
    867874        "Source2 over Coolant2"; 
    868       output TemperatureDifference dTCoolant2=Pipe2.dT  
     875      output Modelica.SIunits.TemperatureDifference dTCoolant2=Pipe2.dT  
    869876        "Coolant2's temperature increase"; 
    870       output TemperatureDifference dTmixedCoolant=Ambient2.T_port-Ambient1.T_port  
     877      output Modelica.SIunits.TemperatureDifference dTmixedCoolant=Ambient2.T_port-Ambient1.T_port  
    871878        "mixed Coolant's temperature increase"; 
    872879      FluidHeatFlow.Sources.Ambient Ambient1(T_Ambient=Modelica.SIunits.Conversions.from_degC(TAmb), 
    … …  
    956963    end ParallelPumpDropOut; 
    957964     
    958     model OneMass  
     965    model OneMass "Example: ccoling of one hot mass"  
    959966      extends Modelica.Icons.Example; 
    960967    annotation (Documentation(info="<HTML> 
    … …  
    971978        experimentSetupOutput); 
    972979      parameter FluidHeatFlow.Media.Medium medium=FluidHeatFlow.Media.Medium()  
     980        "Cooling medium"  
    973981        annotation(choicesAllMatching=true); 
    974982      parameter Modelica.SIunits.CelsiusTemperature TAmb=20  
    975         "ambient temperature"; 
     983        "Ambient temperature"; 
    976984      parameter Modelica.SIunits.CelsiusTemperature TMass=40  
    977         "inital temperature of mass"; 
    978       output TemperatureDifference dTMass= 
     985        "Inital temperature of mass"; 
     986      output Modelica.SIunits.TemperatureDifference dTMass= 
    979987        HeatCapacitor1.port.T-Modelica.SIunits.Conversions.from_degC(TAmb)  
    980988        "Mass over Ambient"; 
    981       output TemperatureDifference dTtoPipe=HeatCapacitor1.port.T-Pipe1.heatPort.T  
     989      output Modelica.SIunits.TemperatureDifference dTtoPipe=HeatCapacitor1.port.T-Pipe1.heatPort.T  
    982990        "Mass over Coolant"; 
    983       output TemperatureDifference dTCoolant=Pipe1.dT  
     991      output Modelica.SIunits.TemperatureDifference dTCoolant=Pipe1.dT  
    984992        "Coolant's temperature increase"; 
    985993      FluidHeatFlow.Sources.Ambient Ambient1(T_Ambient=Modelica.SIunits.Conversions.from_degC(TAmb), 
    … …  
    10151023      connect(Pipe1.flowPort_b, Ambient2.flowPort)  
    10161024        annotation (points=[20,0; 40,0],   style(color=1, rgbcolor={255,0,0})); 
    1017       connect(ThermalConductor1.port_a, HeatCapacitor1.port) annotation (points=[10,-40; 
     1025      connect(ThermalConductor1.port_a, HeatCapacitor1.port) annotation (points=[10,-40;  
    10181026            10,-40; 10,-50; 10,-50],        style(color=42, rgbcolor={191,0,0})); 
    10191027      connect(Pipe1.heatPort, ThermalConductor1.port_b)  
    … …  
    10231031    end OneMass; 
    10241032     
    1025     model TwoMass  
     1033    model TwoMass "Example: cooling of two hot masses"  
    10261034      extends Modelica.Icons.Example; 
    10271035    annotation (Documentation(info="<HTML> 
    … …  
    10381046        experimentSetupOutput); 
    10391047      parameter FluidHeatFlow.Media.Medium medium=FluidHeatFlow.Media.Medium()  
     1048        "Cooling medium"  
    10401049        annotation(choicesAllMatching=true); 
    10411050      parameter Modelica.SIunits.CelsiusTemperature TAmb=20  
    1042         "ambient temperature"; 
     1051        "Ambient temperature"; 
    10431052      parameter Modelica.SIunits.CelsiusTemperature TMass1=40  
    1044         "inital temperature of mass1"; 
     1053        "Inital temperature of mass1"; 
    10451054      parameter Modelica.SIunits.CelsiusTemperature TMass2=60  
    1046         "inital temperature of mass2"; 
    1047       output TemperatureDifference dTMass1= 
     1055        "Inital temperature of mass2"; 
     1056      output Modelica.SIunits.TemperatureDifference dTMass1= 
    10481057        HeatCapacitor1.port.T-Modelica.SIunits.Conversions.from_degC(TAmb)  
    10491058        "Mass1 over Ambient"; 
    1050       output TemperatureDifference dTtoPipe1=HeatCapacitor1.port.T-Pipe1.heatPort.T  
     1059      output Modelica.SIunits.TemperatureDifference dTtoPipe1=HeatCapacitor1.port.T-Pipe1.heatPort.T  
    10511060        "Mass1 over Coolant1"; 
    1052       output TemperatureDifference dTCoolant1=Pipe1.dT  
     1061      output Modelica.SIunits.TemperatureDifference dTCoolant1=Pipe1.dT  
    10531062        "Coolant1's temperature increase"; 
    1054       output TemperatureDifference dTMass2= 
     1063      output Modelica.SIunits.TemperatureDifference dTMass2= 
    10551064        HeatCapacitor2.port.T-Modelica.SIunits.Conversions.from_degC(TAmb)  
    10561065        "Mass2 over Ambient"; 
    1057       output TemperatureDifference dTtoPipe2=HeatCapacitor2.port.T-Pipe2.heatPort.T  
     1066      output Modelica.SIunits.TemperatureDifference dTtoPipe2=HeatCapacitor2.port.T-Pipe2.heatPort.T  
    10581067        "Mass2 over Coolant2"; 
    1059       output TemperatureDifference dTCoolant2=Pipe2.dT  
     1068      output Modelica.SIunits.TemperatureDifference dTCoolant2=Pipe2.dT  
    10601069        "Coolant2's temperature increase"; 
    1061       output TemperatureDifference dTmixedCoolant=Ambient2.T_port-Ambient1.T_port  
     1070      output Modelica.SIunits.TemperatureDifference dTmixedCoolant=Ambient2.T_port-Ambient1.T_port  
    10621071        "mixed Coolant's temperature increase"; 
    10631072      FluidHeatFlow.Sources.Ambient Ambient1(T_Ambient=Modelica.SIunits.Conversions.from_degC(TAmb), 
    … …  
    11151124      connect(Pipe3.flowPort_b, Ambient2.flowPort)  
    11161125        annotation (points=[60,0; 80,0], style(color=1, rgbcolor={255,0,0})); 
    1117       connect(HeatCapacitor2.port, ThermalConductor2.port_a) annotation (points=[10,60; 
     1126      connect(HeatCapacitor2.port, ThermalConductor2.port_a) annotation (points=[10,60;  
    11181127            10,55.5; 10,50; 10,50],   style(color=42, rgbcolor={191,0,0})); 
    11191128      connect(ThermalConductor2.port_b, Pipe2.heatPort)  
    … …  
    11211130      connect(Pipe1.heatPort, ThermalConductor1.port_b) annotation (points=[10,-20; 
    11221131            10,-30],         style(color=42, rgbcolor={191,0,0})); 
    1123       connect(ThermalConductor1.port_a, HeatCapacitor1.port) annotation (points=[10,-50; 
     1132      connect(ThermalConductor1.port_a, HeatCapacitor1.port) annotation (points=[10,-50;  
    11241133            10,-50; 10,-60; 10,-60], 
    11251134                                  style(color=42, rgbcolor={191,0,0})); 
    … …  
    11281137    end TwoMass; 
    11291138     
    1130     package Utilities  
     1139    package Utilities "Utility models for examples"  
    11311140      extends Modelica.Icons.Library; 
    11321141      annotation (Documentation(info="<html> 
    … …  
    11721181</HTML>")); 
    11731182       
    1174       model DoubleRamp  
     1183      model DoubleRamp "Ramp going up and down"  
    11751184        extends Modelica.Blocks.Interfaces.SO; 
    1176         parameter Real offset=1 "offset of ramps"; 
    1177         parameter Modelica.SIunits.Time startTime=0.2 "startTime of 1st ramp"; 
     1185        parameter Real offset=1 "Offset of ramps"; 
     1186        parameter Modelica.SIunits.Time startTime=0.2 "StartTime of 1st ramp"; 
    11781187        parameter Modelica.SIunits.Time interval=0.2  
    1179           "interval between end of 1st and beginning of 2nd ramp"; 
    1180         parameter Real height_1=-1 "|1st ramp|Height of ramp"; 
     1188          "Interval between end of 1st and beginning of 2nd ramp"; 
     1189        parameter Real height_1=-1 "|Ramp 1|Height of ramp"; 
    11811190        parameter Modelica.SIunits.Time duration_1(min=Modelica.Constants.small) = 0.2  
    1182           "|1st ramp|Duration of ramp"; 
    1183         parameter Real height_2=1 "|2nd ramp|Height of ramp"; 
     1191          "|Ramp 1|Duration of ramp"; 
     1192        parameter Real height_2=1 "|Ramp 2|Height of ramp"; 
    11841193        parameter Modelica.SIunits.Time duration_2(min=Modelica.Constants.small) = 0.2  
    1185           "|2nd ramp|Duration of ramp"; 
     1194          "|Ramp 2|Duration of ramp"; 
    11861195        annotation ( 
    11871196          Documentation(info="<HTML> 
    … …  
    13071316            fillPattern=1)))); 
    13081317     
    1309     model IsolatedPipe  
     1318    model IsolatedPipe "Pipe without heat exchange"  
     1319       
    13101320    annotation (Documentation(info="<HTML> 
    13111321<p> 
    … …  
    13271337      extends Interfaces.Partials.SimpleFriction; 
    13281338      parameter Modelica.SIunits.Length h_g=0  
    1329         "geodetic height (heigth difference from flowPort_a to flowPort_b)"; 
     1339        "Geodetic height (heigth difference from flowPort_a to flowPort_b)"; 
    13301340    equation  
    13311341      // coupling with FrictionModel 
    … …  
    13361346    end IsolatedPipe; 
    13371347     
    1338     model HeatedPipe  
     1348    model HeatedPipe "Pipe with heat exchange"  
     1349       
    13391350    annotation (Documentation(info="<HTML> 
    13401351<p> 
    … …  
    13681379      extends Interfaces.Partials.SimpleFriction; 
    13691380      parameter Modelica.SIunits.Length h_g=0  
    1370         "geodetic height (heigth difference from flowPort_a to flowPort_b)"; 
     1381        "Geodetic height (heigth difference from flowPort_a to flowPort_b)"; 
    13711382      Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heatPort  
    13721383        annotation (extent=[-10,-110; 10,-90]); 
    … …  
    13811392    end HeatedPipe; 
    13821393     
    1383     model Valve  
     1394    model Valve "Simple valve"  
     1395       
    13841396    annotation (Documentation(info="<HTML> 
    13851397<p> 
    … …  
    14171429      extends Interfaces.Partials.TwoPort(m=0, final tapT=1); 
    14181430      parameter Boolean LinearCharacteristic=true  
    1419         "|standard characteristic|type of characteristic"  
     1431        "|Standard characteristic|Type of characteristic"  
    14201432        annotation(choices(choice=true "Linear", choice=false "Exponential")); 
    14211433      parameter Real y1(min=small)=1  
    1422         "|standard characteristic|max. valve opening"; 
     1434        "|Standard characteristic|Max. valve opening"; 
    14231435      parameter Modelica.SIunits.VolumeFlowRate Kv1(min=small)=1  
    1424         "|standard characteristic|max. flow @ y = y1"; 
     1436        "|Standard characteristic|Max. flow @ y = y1"; 
    14251437      parameter Real kv0(min=small,max=1-small)=0.01  
    1426         "|standard characteristic|leakage flow / max.flow @ y = 0"; 
     1438        "|Standard characteristic|Leakage flow / max.flow @ y = 0"; 
    14271439      parameter Modelica.SIunits.Pressure dp0=1  
    1428         "|standard characteristic|standard pressure drop"; 
     1440        "|Standard characteristic|Standard pressure drop"; 
    14291441      parameter Modelica.SIunits.Density rho0 = 10  
    1430         "|standard characteristic|standard medium's density"; 
     1442        "|Standard characteristic|Standard medium's density"; 
    14311443      parameter Real frictionLoss(min=0, max=1) = 0  
    1432         "part of friction losses fed to medium"; 
     1444        "Part of friction losses fed to medium"; 
    14331445    protected  
    14341446      constant Real small = Modelica.Constants.small; 
    14351447      constant Real eps = Modelica.Constants.eps; 
    1436       Real yLim = max(min(y,y1),0) "limited valve opening"; 
    1437       Modelica.SIunits.VolumeFlowRate Kv "standard flow rate"; 
     1448      Real yLim = max(min(y,y1),0) "Limited valve opening"; 
     1449      Modelica.SIunits.VolumeFlowRate Kv "Standard flow rate"; 
    14381450    public  
    14391451      Modelica.Blocks.Interfaces.RealInput y  
    … …  
    15231535            fillPattern=1)))); 
    15241536     
    1525     connector FlowPort  
     1537    connector FlowPort "conector flow port"  
     1538       
    15261539    annotation (Documentation(info="<HTML> 
    15271540<p> 
    … …  
    15421555</p> 
    15431556</HTML>")); 
    1544       parameter FluidHeatFlow.Media.Medium medium; 
     1557      parameter FluidHeatFlow.Media.Medium medium "Medium in the connector"; 
    15451558      Modelica.SIunits.Pressure p; 
    15461559      flow Modelica.SIunits.MassFlowRate m_flow; 
    … …  
    15491562    end FlowPort; 
    15501563     
    1551     connector FlowPort_a  
     1564    connector FlowPort_a "Filled flow port (used upstream)"  
     1565       
    15521566    annotation (Documentation(info="<HTML> 
    15531567<p> 
    … …  
    15821596    end FlowPort_a; 
    15831597     
    1584     connector FlowPort_b  
     1598    connector FlowPort_b "Hollow flow port (used downstream)"  
     1599       
    15851600    annotation (Documentation(info="<HTML> 
    15861601<p> 
    … …  
    16081623    end FlowPort_b; 
    16091624     
    1610     package Partials  
     1625    package Partials "Partial models"  
    16111626      extends Modelica.Icons.Library; 
    16121627    annotation (Documentation(info="<HTML> 
    … …  
    16691684")); 
    16701685       
    1671       partial model SimpleFriction  
     1686      partial model SimpleFriction "Simple friction model"  
     1687         
    16721688      annotation (Documentation(info="<HTML> 
    16731689<p> 
    … …  
    17191735              string="dp ~ V_flow²"))); 
    17201736        parameter Modelica.SIunits.VolumeFlowRate V_flowLaminar(min=Modelica.Constants.small)=0.1  
    1721           "|SimpleFriction|laminar volume flow"; 
     1737          "|SimpleFriction|Laminar volume flow"; 
    17221738        parameter Modelica.SIunits.Pressure dpLaminar=0.1  
    1723           "|SimpleFriction|laminar pressure drop"; 
     1739          "|SimpleFriction|Laminar pressure drop"; 
    17241740        parameter Modelica.SIunits.VolumeFlowRate V_flowNominal=1  
    1725           "|SimpleFriction|nominal volume flow"; 
     1741          "|SimpleFriction|Nominal volume flow"; 
    17261742        parameter Modelica.SIunits.Pressure dpNominal=1  
    1727           "|SimpleFriction|nominal pressure drop"; 
     1743          "|SimpleFriction|Nominal pressure drop"; 
    17281744        parameter Real frictionLoss(min=0, max=1) = 0  
    1729           "|SimpleFriction|part of friction losses fed to medium"; 
     1745          "|SimpleFriction|Part of friction losses fed to medium"; 
    17301746        Modelica.SIunits.Pressure pressureDrop; 
    17311747        Modelica.SIunits.VolumeFlowRate VolumeFlow; 
    … …  
    17511767      end SimpleFriction; 
    17521768       
    1753       partial model TwoPort  
     1769      partial model TwoPort "Partial model of two port"  
    17541770         
    17551771      annotation (Documentation(info="<HTML> 
    … …  
    17641780</HTML>")); 
    17651781        parameter FluidHeatFlow.Media.Medium medium=FluidHeatFlow.Media.Medium()  
     1782          "Medium in the component"  
    17661783          annotation(choicesAllMatching=true); 
    1767         parameter Modelica.SIunits.Mass m=1 "mass of medium"; 
     1784        parameter Modelica.SIunits.Mass m=1 "Mass of medium"; 
    17681785        parameter Modelica.SIunits.Temperature T0=Modelica.SIunits.Conversions.from_degC(20)  
    1769           "initial temperature of medium"  
     1786          "Initial temperature of medium"  
    17701787          annotation(Dialog(enable=m>Modelica.Constants.small)); 
    17711788        parameter Real tapT(final min=0, final max=1)=1  
    1772           "defines temperature of heatPort between inlet and outlet temperature"; 
     1789          "Defines temperature of heatPort between inlet and outlet temperature"; 
    17731790        Modelica.SIunits.Pressure dp=flowPort_a.p - flowPort_b.p  
    1774           "pressure drop a->b"; 
     1791          "Pressure drop a->b"; 
    17751792        Modelica.SIunits.VolumeFlowRate V_flow=flowPort_a.m_flow/medium.rho  
    17761793          "Volume flow a->b"; 
    1777         Modelica.SIunits.HeatFlowRate Q_flow "heat exchange with ambient"; 
     1794        Modelica.SIunits.HeatFlowRate Q_flow "Heat exchange with ambient"; 
    17781795        output Modelica.SIunits.Temperature T(start=T0)  
    1779           "outlet temperature of medium"; 
     1796