Show
Ignore:
Timestamp:
08/17/2007 09:00:13 AM (17 months ago)
Author:
otter
Message:

Fixed html formatting errors
(removed <body>, replaced <h1>, <h2>, <h3> by <h4>)

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • Modelica/trunk/Modelica/Media/package.mo

    r540 r547  
     1within Modelica; 
    12package Media "Property models of media" 
    23extends Modelica.Icons.Library; 
     
    23492350  //  Real[4] dddX=Medium.density_derX(medium,MM); 
    23502351    annotation (Documentation(info="<html> 
    2351 <body> 
    23522352<p>An example for using ideal gas properties and how to compute isentropic enthalpy changes. 
    23532353The function that is implemented is approximate, but usually very good: the second medium record medium2 
    23542354is given to compare the approximation. 
    23552355</p> 
    2356 </body> 
    23572356</html>"), 
    23582357      experiment(Tolerance=1e-005), 
     
    24252424     
    24262425    annotation (Documentation(info="<html> 
    2427 <body> 
    24282426<h4>Example: TwoPhaseWater</h4> 
    24292427The TwoPhaseWater package demonstrates how to extend the parsimonius 
     
    24722470</ol> 
    24732471<p>The sample model TestTwoPhaseStates test the extended properties</p> 
     2472 
     2473<p> 
    24742474The same procedure can be used to compute properties at other state 
    2475 points, e.g. when an isentropic reference state is computed.<br> 
    2476 <br> 
    2477 </body> 
     2475points, e.g. when an isentropic reference state is computed. 
     2476</p> 
    24782477</html> 
    24792478")); 
    2480     model TestTwoPhaseStates "test the above model"  
     2479    model TestTwoPhaseStates "Test the above model"  
    24812480      ExtendedProperties medium(p(start = 700.0), 
    24822481       h(start = 8.0e5)); 
     
    24892488          experimentSetupOutput, 
    24902489        Documentation(info="<html> 
    2491 <body> 
    2492 <h4>Example:TestTwoPhaseStates</h4> 
    2493 </p> For details see the documentation of the example package TwoPhaseWater<p> 
    2494 </body> 
     2490<p> For details see the documentation of the example package TwoPhaseWater</p> 
    24952491</html> 
    24962492")); 
     
    25232519      Medium.SpecificEnthalpy h_is = Medium.isentropicEnthalpyApproximation(2.0e5, medium); 
    25242520      annotation (Documentation(info="<html> 
    2525 <body> 
    25262521<p>An example for using ideal gas properties and how to compute isentropic enthalpy changes. 
    25272522The function that is implemented is approximate, but usually very good: the second medium record medium2 
    25282523is given to compare the approximation. 
    25292524</p> 
    2530 </body> 
    25312525</html>")); 
    25322526    equation  
     
    25642558      Real[4] dddX=Medium.density_derX(medium2.state); 
    25652559      annotation (Documentation(info="<html> 
    2566 <body> 
    25672560<p>An example for using ideal gas properties and how to compute isentropic enthalpy changes. 
    25682561The function that is implemented is approximate, but usually very good: the second medium record medium2 
    25692562is given to compare the approximation. 
    25702563</p> 
    2571 </body> 
    25722564</html>")); 
    25732565    equation  
     
    47784770      h_is := specificEnthalpy(downstreamState); 
    47794771      annotation (Documentation(info="<html> 
    4780 <body> 
    4781 A minor approximation is used: the reference density is used instead of the real one, which would require a numeric solution. 
    4782 </body> 
     4772<p> 
     4773A minor approximation is used: the reference density is used instead of the real  
     4774one, which would require a numeric solution. 
     4775</p> 
    47834776</html>")); 
    47844777    end isentropicEnthalpy; 
     
    48564849     
    48574850  annotation (Documentation(info="<html> 
    4858 <body> 
    4859 <h2>Linear Compressibility Fluid Model</h2> 
     4851<h4>Linear Compressibility Fluid Model</h4> 
    48604852<p>This linear compressibility fluid model is based on the assumptions that: 
    48614853</p> 
     
    49174909</dd> 
    49184910</dl> 
    4919 </body> 
    49204911</html>")); 
    49214912end PartialLinearFluid; 
     
    50795070      SpecificEntropy SMAX "maximum entropy"; 
    50805071      annotation(Documentation( 
    5081           info="<html><body> 
     5072          info="<html> 
    50825073          <p>The minimum pressure mostly applies to the liquid state only. 
    50835074          The minimum density is also arbitrary, but is reasonable for techical 
    50845075          applications to limit iterations in non-linear systems. The limits in 
    50855076          enthalpy and entropy are used as safeguards in inverse iterations.</p> 
    5086           </body></html>")); 
     5077          </html>")); 
    50875078    end FluidLimits; 
    50885079     
     
    71297120      "coefficient in Bridgmans table, see info for usage"; 
    71307121    Real dgf=-dfg "coefficient in Bridgmans table, see info for usage"; 
    7131     annotation (Documentation(info=" 
    7132                 <HTML> 
    7133                 <p> 
    7134                 <pre> 
     7122    annotation (Documentation(info="<HTML> 
     7123<p> 
    71357124Important: the phase equilibrium conditions are not yet considered. 
    7136 this means that bridgemans tables do not yet work in the two phase region 
    7137 some derivatives are 0 or infinity anyways 
     7125this means that bridgemans tables do not yet work in the two phase region. 
     7126Some derivatives are 0 or infinity anyways. 
    71387127Idea: don't use the values in Bridgmans table directly, all 
    71397128derivatives are calculated as the quotient of two entries in the 
     
    71427131involved in the derivative and the first letter is alwys a d to remind 
    71437132of differentiation. 
     7133</p> 
     7134 
     7135<pre> 
    71447136Example 1: Get the derivative of specific entropy s wrt Temperature at 
    71457137constant specific volume (btw identical to constant density) 
     
    71837175end BridgmansTablesForWater; 
    71847176                </pre> 
    7185                 </p> 
     7177       
    71867178                </HTML> 
    71877179                "));