Changeset 547

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

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

Location:
Modelica/trunk/Modelica
Files:
7 modified

Legend:

Unmodified
Added
Removed

  • Modelica/trunk/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3.mo

    r542 r547  
    366366       
    367367      annotation (defaultComponentPrefixes="protected", 
    368                   Icon(Rectangle(extent=[-20, 2; 22, -2], style(rgbcolor={255,204,51}, thickness=2))),  
     368                  Icon(Rectangle(extent=[-20, 2; 22, -2], style(rgbcolor={255,204,51}, thickness=2))), 
    369369        Documentation(info="<html> 
    370370<p> 
    … …  
    383383      annotation ( 
    384384        Icon(Rectangle(extent=[-20, 2; 22, -2], style(rgbcolor={255,204,51}, thickness=2))), 
    385         Diagram,  
     385        Diagram, 
    386386        Documentation(info="<html> 
    387387<p> 
    … …  
    866866          width=0.71, 
    867867          height=0.71), 
    868         Documentation(info=" 
     868        Documentation(info="<html> 
     869<p> 
    869870Models the gearbox used in the first three joints with all its effects, 
    870871like elasticity and friction. 
    … …  
    886887Since relative quantities are used as state variables, this simplifies 
    887888the definition of initial values considerably. 
     889</p> 
     890</html> 
    888891"),     Icon( 
    889892          Rectangle(extent=[-100,10; -60,-10],  style( 
    … …  
    966969          width=0.63, 
    967970          height=0.63), 
    968         Documentation(info="The elasticity and damping in the gearboxes of the outermost 
     971        Documentation(info="<html> 
     972<p> 
     973The elasticity and damping in the gearboxes of the outermost 
    969974three joints of the robot is neglected. 
    970975Default values for all parameters are given for joint 4. 
     976</p> 
     977</html> 
    971978"),     Icon( 
    972979          Rectangle(extent=[-100,10; -60,-10],  style( 
    … …  
    10401047          width=0.68, 
    10411048          height=0.8), 
    1042         Documentation(info=" Default values are given for the motor of joint 1. 
     1049        Documentation(info="<html> 
     1050<p> 
     1051Default values are given for the motor of joint 1. 
    10431052The input of the motor is the desired current 
    10441053(the actual current is proportional to the torque 
    10451054produced by the motor). 
     1055</p> 
     1056</html> 
    10461057"),     Icon(Text(extent=[0, 120; 0, 60], string="%name"), Line(points=[80, -102; 
    10471058                 80, -10], style( 
    … …  
    12151226          y=0.01, 
    12161227          width=0.84, 
    1217           height=0.76),  
     1228          height=0.76), 
    12181229        Documentation(info="<html> 
    12191230<p> 

  • Modelica/trunk/Modelica/Media/CompressibleLiquids.mo

    r535 r547  
    5252                           reference_p = 101325, reference_T = 298.15); 
    5353    annotation (Documentation(info="<html> 
    54 <h2>Water model with linear compressibility at ambient conditions</h2> 
     54<h4>Water model with linear compressibility at ambient conditions</h4> 
    5555</html>")); 
    5656  end LinearWater_pT_Ambient; 
    5757   
    5858  annotation (Documentation(info="<html> 
    59 <body> 
    60 <h2>Fluid models with linear compressibility, using PartialLinearFluid as base class.</h2> 
     59 
     60<h4>Fluid models with linear compressibility, using PartialLinearFluid as base class.</h4> 
    6161<p>The linear compressibility fluid models contained in this package are based on the assumptions that: 
    6262</p> 
    … …  
    8989</p> 
    9090 
    91 </body> 
    9291</html>")); 
    9392end CompressibleLiquids; 

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

    r544 r547  
    604604     
    605605    annotation (Documentation(info="<html> 
    606 <body> 
    607  
    608606<p> 
    609607The used formula are based on the method of Chung et al (1984, 1988) referred to in ref [1] chapter 9. 
    … …  
    764762Published: Oct 01, 1994. 
    765763</p> 
    766 <p><b>Known limits of validity:</p></br> 
     764<p><b>Known limits of validity:</b></br> 
    767765The data is valid for 
    768766temperatures between 200 K and 6000 K.  A few of the data sets for 
    … …  
    10701068     
    10711069 annotation (Documentation(info="<html> 
    1072 <body> 
    10731070 
    10741071<p> 

  • Modelica/trunk/Modelica/Media/Water/IF97_Utilities.mo

    r544 r547  
    9292      email: hubertus@modelon.se 
    9393      </address> 
    94       </HTML>", revisions="<h1>Intermediate release notes during development<\\h1> 
     94      </HTML>", revisions="<h4>Intermediate release notes during development<\\h4> 
    9595<p>Currenly the Events/noEvents switch is only implmented for p-h states. Only after testing that implmentation, it will be extended to dT.</p>")); 
    9696  extends Modelica.Icons.Library; 
    … …  
    36263626        annotation ( 
    36273627            Documentation(                                                                                                    info="<html> 
    3628   <body> 
     3628  <p> 
    36293629  Equation number 2 from:<br> 
    36303630  The International Association for the Properties of Water and Steam<br> 
    … …  
    36343634  Function of Enthalpy and Entropy p(h,s) to the IAPWS Industrial 
    36353635  Formulation 1997 for the Thermodynamic Properties of Water and Steam<br> 
    3636   </body> 
     3636  </p> 
    36373637  </html> 
    36383638  ")); 
    … …  
    36643664        annotation ( 
    36653665            Documentation(                                                                                                    info="<html> 
    3666   <body> 
     3666  <p> 
    36673667  Equation number 3 from:<br> 
    36683668  The International Association for the Properties of Water and Steam<br> 
    … …  
    36723672  Function of Enthalpy and Entropy p(h,s) to the IAPWS Industrial 
    36733673  Formulation 1997 for the Thermodynamic Properties of Water and Steam<br> 
    3674   </body> 
     3674  </p> 
    36753675  </html> 
    36763676  ")); 
    … …  
    37033703      annotation ( 
    37043704            Documentation(                                                                                                    info="<html> 
    3705 <body> 
     3705<p> 
    37063706Equation number 4 from:<br> 
    37073707The International Association for the Properties of Water and Steam<br> 
    … …  
    37113711Function of Enthalpy and Entropy p(h,s) to the IAPWS Industrial 
    37123712Formulation 1997 for the Thermodynamic Properties of Water and Steam<br> 
    3713 </body> 
     3713</p> 
    37143714      </html> 
    37153715")); 
    … …  
    37423742          annotation ( 
    37433743            Documentation(                                                                                                    info="<html> 
    3744       <body> 
     3744      <p> 
    37453745      Equation number 5 from:<br> 
    37463746      The International Association for the Properties of Water and Steam<br> 
    … …  
    37503750      Function of Enthalpy and Entropy p(h,s) to the IAPWS Industrial 
    37513751      Formulation 1997 for the Thermodynamic Properties of Water and Steam<br> 
    3752       </body> 
     3752      </p> 
    37533753      </html> 
    37543754      ")); 
    … …  
    37693769          annotation ( 
    37703770      Documentation(info="<html> 
    3771       <body> 
     3771      <p> 
    37723772      &nbsp;Equation number 1 from:<br> 
    37733773      <div style=\"text-align: center;\">&nbsp;[1] The international Association 
    … …  
    37803780      the Thermodynamic Properties of<br> 
    37813781      &nbsp;Water and Steam</div> 
    3782       </body> 
     3782      </p> 
    37833783      </html>")); 
    37843784         
    … …  
    37883788      annotation (Documentation( 
    37893789       info="<html> 
    3790        <body> 
     3790       <p> 
    37913791       &nbsp;Equation from:<br> 
    37923792       <div style=\"text-align: center;\">&nbsp;[1] The international Association 
    … …  
    37993799       the Thermodynamic Properties of<br> 
    38003800       &nbsp;Water and Steam</div> 
    3801        </body> 
     3801       </p> 
    38023802       </html>")); 
    38033803       
    … …  
    38273827            Documentation( 
    38283828       info="<html> 
    3829  <body> 
     3829 <p> 
    38303830 &nbsp;Equation number 2 from:<br> 
    38313831 <div style=\"text-align: center;\">&nbsp;[1] The international Association 
    … …  
    38383838 the Thermodynamic Properties of<br> 
    38393839 &nbsp;Water and Steam</div> 
    3840  </body> 
     3840 </p> 
    38413841 </html>")); 
    38423842      algorithm  
    … …  
    38693869            Documentation( 
    38703870       info="<html> 
    3871  <body> 
     3871 <p> 
    38723872 &nbsp;Equation number 3 from:<br> 
    38733873 <div style=\"text-align: center;\">&nbsp;[1] The international Association 
    … …  
    38803880 the Thermodynamic Properties of<br> 
    38813881 &nbsp;Water and Steam</div> 
    3882  </body> 
     3882 </p> 
    38833883 </html>")); 
    38843884      algorithm  
    … …  
    39113911            Documentation( 
    39123912       info="<html> 
    3913  <body> 
     3913 <p> 
    39143914 &nbsp;Equation number 4 from:<br> 
    39153915 <div style=\"text-align: center;\">&nbsp;[1] The international Association 
    … …  
    39223922 the Thermodynamic Properties of<br> 
    39233923 &nbsp;Water and Steam</div> 
    3924  </body> 
     3924 </p> 
    39253925 </html>")); 
    39263926      algorithm  
    … …  
    39533953            Documentation( 
    39543954       info="<html> 
    3955  <body> 
     3955 <p> 
    39563956 &nbsp;Equation number 5 from:<br> 
    39573957 <div style=\"text-align: center;\">&nbsp;[1] The international Association 
    … …  
    39643964 the Thermodynamic Properties of<br> 
    39653965 &nbsp;Water and Steam</div> 
    3966  </body> 
     3966 </p> 
    39673967 </html>")); 
    39683968      algorithm  
    … …  
    39953995            Documentation( 
    39963996       info="<html> 
    3997  <body> 
     3997 <p> 
    39983998 &nbsp;Equation number 6 from:<br> 
    39993999 <div style=\"text-align: center;\">&nbsp;[1] The international Association 
    … …  
    40064006 the Thermodynamic Properties of<br> 
    40074007 &nbsp;Water and Steam</div> 
    4008  </body> 
     4008 </p> 
    40094009 </html>")); 
    40104010      algorithm  
    … …  
    40354035            Documentation( 
    40364036       info="<html> 
    4037  <body> 
     4037 <p> 
    40384038 &nbsp;Equation number 7 from:<br> 
    40394039 <div style=\"text-align: center;\">&nbsp;[1] The international Association 
    … …  
    40464046 the Thermodynamic Properties of<br> 
    40474047 &nbsp;Water and Steam</div> 
    4048  </body> 
     4048 </p> 
    40494049 </html>")); 
    40504050      algorithm  
    … …  
    40754075            Documentation( 
    40764076       info="<html> 
    4077  <body> 
     4077 <p> 
    40784078 &nbsp;Equation number 8 from:<br> 
    40794079 <div style=\"text-align: center;\">&nbsp;[1] The international Association 
    … …  
    40864086 the Thermodynamic Properties of<br> 
    40874087 &nbsp;Water and Steam</div> 
    4088  </body> 
     4088 </p> 
    40894089 </html>")); 
    40904090      algorithm  
    … …  
    41174117            Documentation( 
    41184118       info="<html> 
    4119  <body> 
     4119 <p> 
    41204120 &nbsp;Equation number 9 from:<br> 
    41214121 <div style=\"text-align: center;\">&nbsp;[1] The international Association 
    … …  
    41284128 the Thermodynamic Properties of<br> 
    41294129 &nbsp;Water and Steam</div> 
    4130  </body> 
     4130 </p> 
    41314131 </html>")); 
    41324132      algorithm  
    … …  
    41414141      annotation (                                                                                                    uses(Modelica(version="1.6")), 
    41424142  Documentation(info="<html> 
    4143 <body> 
     4143<p> 
    41444144The International Association for the Properties of Water and Steam<br> 
    41454145Milan, Italy<br> 
    … …  
    41474147Release on the Pressure along the Melting and the Sublimation Curves of 
    41484148Ordinary Water Substance<br> 
    4149 </body> 
     4149</p> 
    41504150</html> 
    41514151")); 
    … …  
    41624162        annotation ( 
    41634163            Documentation(                                                                                                    info="<html> 
    4164   <body> 
     4164  <p> 
    41654165  Equation 1 from:<br> 
    41664166  The International Association for the Properties of Water and Steam<br> 
    … …  
    41694169  Release on the Pressure along the Melting and the Sublimation Curves of 
    41704170  Ordinary Water Substance<br> 
    4171   </body> 
     4171  </p> 
    41724172  </html> 
    41734173  ")); 
    … …  
    41884188        annotation ( 
    41894189            Documentation(                                                                                                    info="<html> 
    4190   <body> 
     4190  <p> 
    41914191  Equation 2 from:<br> 
    41924192  The International Association for the Properties of Water and Steam<br> 
    … …  
    41954195  Release on the Pressure along the Melting and the Sublimation Curves of 
    41964196  Ordinary Water Substance<br> 
    4197   </body> 
     4197  </p> 
    41984198  </html> 
    41994199  ")); 
    … …  
    42154215        annotation ( 
    42164216            Documentation(                                                                                                    info="<html> 
    4217   <body> 
     4217  <p> 
    42184218  Equation 3 from:<br> 
    42194219  The International Association for the Properties of Water and Steam<br> 
    … …  
    42224222  Release on the Pressure along the Melting and the Sublimation Curves of 
    42234223  Ordinary Water Substance<br> 
    4224   </body> 
     4224  </p> 
    42254225  </html> 
    42264226  ")); 
    … …  
    42424242        annotation ( 
    42434243            Documentation(                                                                                                    info="<html> 
    4244   <body> 
     4244  <p> 
    42454245  Equation 6 from:<br> 
    42464246  The International Association for the Properties of Water and Steam<br> 
    … …  
    42494249  Release on the Pressure along the Melting and the Sublimation Curves of 
    42504250  Ordinary Water Substance<br> 
    4251   </body> 
     4251  </p> 
    42524252  </html> 
    42534253  ")); 

  • Modelica/trunk/Modelica/Media/Water/package.mo

    r541 r547  
    676676    "specific heat capacity at constant pressure of water"  
    677677     
    678       annotation (Documentation(info="<html><body> 
     678      annotation (Documentation(info="<html> 
    679679                                <p>In the two phase region this function returns the interpolated heat capacity between the 
    680680                                liquid and vapour state heat capacities.</p> 
    681                           </body><html>")); 
     681                          <html>")); 
    682682  algorithm  
    683683    if dT_explicit then 

  • 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