Changeset 585

Show
Ignore:
Timestamp:
08/21/2007 09:18:41 AM (17 months ago)
Author:
otter
Message:

Fixed html formatting bugs.

Location:
Modelica/trunk/Modelica
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • Modelica/trunk/Modelica/Media/IdealGases/Common/SingleGasesData.mo

    r584 r585  
    99  report TP-2002-211556</p> 
    1010</blockquote> 
    11 <pre> 
    12 <p>The record entries are defined in <b>IdealGases.DataRecord</b>. Data 
    13 records for the following gases are provided: 
    14 </p> 
    1511 
    1612<pre> 
    … …  
    193189 BaO+      CH3CO_acetyl    DBr             In2F6   Na3Cl3   ScO     
    194190 BaOH      C2H4            DCl             In2I2   Na3F3    ScO+    
    195 </pre></HTML>")); 
     191</pre> 
     192 
     193</HTML>")); 
    196194   
    197195  constant IdealGases.Common.DataRecord Ag( 

  • Modelica/trunk/Modelica/Thermal/FluidHeatFlow.mo

    r582 r585  
    10261026      connect(Pipe1.flowPort_b, Ambient2.flowPort)  
    10271027        annotation (points=[20,0; 40,0],   style(color=1, rgbcolor={255,0,0})); 
    1028       connect(ThermalConductor1.port_a, HeatCapacitor1.port) annotation (points=[10,-40;  
     1028      connect(ThermalConductor1.port_a, HeatCapacitor1.port) annotation (points=[10,-40; 
    10291029            10,-40; 10,-50; 10,-50],        style(color=42, rgbcolor={191,0,0})); 
    10301030      connect(Pipe1.heatPort, ThermalConductor1.port_b)  
    … …  
    11271127      connect(Pipe3.flowPort_b, Ambient2.flowPort)  
    11281128        annotation (points=[60,0; 80,0], style(color=1, rgbcolor={255,0,0})); 
    1129       connect(HeatCapacitor2.port, ThermalConductor2.port_a) annotation (points=[10,60;  
     1129      connect(HeatCapacitor2.port, ThermalConductor2.port_a) annotation (points=[10,60; 
    11301130            10,55.5; 10,50; 10,50],   style(color=42, rgbcolor={191,0,0})); 
    11311131      connect(ThermalConductor2.port_b, Pipe2.heatPort)  
    … …  
    11331133      connect(Pipe1.heatPort, ThermalConductor1.port_b) annotation (points=[10,-20; 
    11341134            10,-30],         style(color=42, rgbcolor={191,0,0})); 
    1135       connect(ThermalConductor1.port_a, HeatCapacitor1.port) annotation (points=[10,-50;  
     1135      connect(ThermalConductor1.port_a, HeatCapacitor1.port) annotation (points=[10,-50; 
    11361136            10,-50; 10,-60; 10,-60], 
    11371137                                  style(color=42, rgbcolor={191,0,0})); 
    … …  
    11901190        parameter Modelica.SIunits.Time interval=0.2  
    11911191          "Interval between end of 1st and beginning of 2nd ramp"; 
    1192         parameter Real height_1=-1 "Height of ramp" 
     1192        parameter Real height_1=-1 "Height of ramp"  
    11931193          annotation(Dialog(group="Ramp 1")); 
    11941194        parameter Modelica.SIunits.Time duration_1(min=Modelica.Constants.small) = 0.2  
    1195           "Duration of ramp" 
     1195          "Duration of ramp"  
    11961196          annotation(Dialog(group="Ramp 1")); 
    1197         parameter Real height_2=1 "Height of ramp" 
     1197        parameter Real height_2=1 "Height of ramp"  
    11981198          annotation(Dialog(group="Ramp 2")); 
    11991199        parameter Modelica.SIunits.Time duration_2(min=Modelica.Constants.small) = 0.2  
    1200           "Duration of ramp" 
     1200          "Duration of ramp"  
    12011201          annotation(Dialog(group="Ramp 2")); 
    12021202        annotation ( 
    … …  
    12501250<p> 
    12511251This package contains components: 
     1252</p> 
     1253 
    12521254<ul> 
    12531255<li>pipe without heat exchange</li> 
    12541256<li>pipe with heat exchange</li> 
    12551257<li>valve (simple controlled valve)</li> 
    1256 <ul> 
    1257 </p> 
     1258</ul> 
     1259 
    12581260<p> 
    12591261Pressure drop is taken from partial model SimpleFriction.<br> 
    12601262Thermodynamic equations are defined in partial models (package Partials). 
    12611263</p> 
    1262 <p> 
    12631264 
    12641265</HTML>", revisions="<HTML> 
    … …  
    14351436              fillPattern=1))), Diagram); 
    14361437      extends Interfaces.Partials.TwoPort(m=0, final tapT=1); 
    1437       parameter Boolean LinearCharacteristic=true  
    1438         "Type of characteristic"  
    1439         annotation(Dialog(group="Standard characteristic"), choices(choice=true "Linear", choice=false "Exponential")); 
    1440       parameter Real y1(min=small)=1  
    1441         "Max. valve opening" 
     1438      parameter Boolean LinearCharacteristic=true "Type of characteristic"  
     1439        annotation(Dialog(group="Standard characteristic"), choices(choice=true "Linear", choice=false  
     1440            "Exponential")); 
     1441      parameter Real y1(min=small)=1 "Max. valve opening"  
    14421442        annotation(Dialog(group="Standard characteristic")); 
    14431443      parameter Modelica.SIunits.VolumeFlowRate Kv1(min=small)=1  
    1444         "Max. flow @ y = y1" 
     1444        "Max. flow @ y = y1"  
    14451445        annotation(Dialog(group="Standard characteristic")); 
    14461446      parameter Real kv0(min=small,max=1-small)=0.01  
    1447         "Leakage flow / max.flow @ y = 0" 
     1447        "Leakage flow / max.flow @ y = 0"  
    14481448        annotation(Dialog(group="Standard characteristic")); 
    1449       parameter Modelica.SIunits.Pressure dp0=1  
    1450         "Standard pressure drop" 
     1449      parameter Modelica.SIunits.Pressure dp0=1 "Standard pressure drop"  
    14511450        annotation(Dialog(group="Standard characteristic")); 
    1452       parameter Modelica.SIunits.Density rho0 = 10  
    1453         "Standard medium's density" 
     1451      parameter Modelica.SIunits.Density rho0 = 10 "Standard medium's density"  
    14541452        annotation(Dialog(group="Standard characteristic")); 
    14551453      parameter Real frictionLoss(min=0, max=1) = 0  
    … …  
    17471745              string="dp ~ V_flow²"))); 
    17481746        parameter Modelica.SIunits.VolumeFlowRate V_flowLaminar(min=Modelica.Constants.small)=0.1  
    1749           "Laminar volume flow" 
     1747          "Laminar volume flow"  
    17501748          annotation(Dialog(group="Simple Friction")); 
    17511749        parameter Modelica.SIunits.Pressure dpLaminar=0.1  
    1752           "Laminar pressure drop" 
     1750          "Laminar pressure drop"  
    17531751          annotation(Dialog(group="Simple Friction")); 
    17541752        parameter Modelica.SIunits.VolumeFlowRate V_flowNominal=1  
    1755           "Nominal volume flow" 
     1753          "Nominal volume flow"  
    17561754          annotation(Dialog(group="Simple Friction")); 
    1757         parameter Modelica.SIunits.Pressure dpNominal=1  
    1758           "Nominal pressure drop" 
     1755        parameter Modelica.SIunits.Pressure dpNominal=1 "Nominal pressure drop" 
    17591756          annotation(Dialog(group="Simple Friction")); 
    17601757        parameter Real frictionLoss(min=0, max=1) = 0  
    1761           "Part of friction losses fed to medium" 
     1758          "Part of friction losses fed to medium"  
    17621759          annotation(Dialog(group="Simple Friction")); 
    17631760        Modelica.SIunits.Pressure pressureDrop; 
    … …  
    23692366<p> 
    23702367This package contains different types of sources: 
     2368</p> 
     2369 
    23712370<ul> 
    23722371<li>Ambient with constant pressure and temperature</li> 
    … …  
    23762375<li>Constant and prescribed pressure increase</li> 
    23772376<li>Simple pump with mechanical flange</li> 
    2378 <ul> 
    2379 </p> 
     2377</ul> 
     2378 
    23802379<p> 
    23812380Thermodynamic equations are defined in partial models (package Interfaces.Partials).<br> 
    23822381All fans / pumps are considered without losses, they do not change enthalpy flow. 
    23832382</p> 
    2384 <p> 
    23852383 
    23862384</HTML>", revisions="<HTML> 
    … …  
    26972695        Diagram); 
    26982696      extends Interfaces.Partials.TwoPort(final tapT=1); 
    2699       parameter Modelica.SIunits.AngularVelocity w_Nominal=1  
    2700         "Nominal speed" 
     2697      parameter Modelica.SIunits.AngularVelocity w_Nominal=1 "Nominal speed"  
    27012698          annotation(Dialog(group="Pump characteristic")); 
    27022699      parameter Modelica.SIunits.Pressure dp0=2  
    2703         "Max. pressure increase @ V_flow=0" 
     2700        "Max. pressure increase @ V_flow=0"  
    27042701          annotation(Dialog(group="Pump characteristic")); 
    27052702      parameter Modelica.SIunits.VolumeFlowRate V_flow0=2  
    2706         "Max. volume flow rate @ dp=0" 
     2703        "Max. volume flow rate @ dp=0"  
    27072704          annotation(Dialog(group="Pump characteristic")); 
    27082705      Modelica.SIunits.AngularVelocity w=der(flange_a.phi) "Speed";