Changeset 1103 for trunk/Modelica

Show
Ignore:
Timestamp:
03/14/08 17:54:32 (8 months ago)
Author:
kproelss
Message:

added function for enthalpy of non-condensing gas, resolved ticket #61

Location:
trunk/Modelica/Media
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/Modelica/Media/Air.mo

    r887 r1103  
    515515     h := SingleGasNasa.h_Tlow(data=steam, T=T, refChoice=3, h_off=46479.819+2501014.5); 
    516516   end enthalpyOfCondensingGas; 
     517 
     518   redeclare function extends enthalpyOfNonCondensingGas 
     519      "Return specific enthalpy of dry air as a function of temperature T" 
     520 
     521     annotation(Inline=false,smoothOrder=5, 
     522        Documentation(info="<html> 
     523Specific enthalpy of dry air is computed from temperature. 
     524</html>")); 
     525   algorithm 
     526     h := SingleGasNasa.h_Tlow(data=dryair, T=T, refChoice=3, h_off=25104.684); 
     527   end enthalpyOfNonCondensingGas; 
    517528 
    518529  function enthalpyOfWater 

  • trunk/Modelica/Media/package.mo

    r1073 r1103  
    30493049                lineColor={255,0,0}, 
    30503050                fillColor={255,0,0}, 
    3051                 fillPattern=FillPattern.Solid)}) 
    3052           , 
     3051                fillPattern=FillPattern.Solid)}), 
    30533052          Diagram(coordinateSystem( 
    30543053              preserveAspectRatio=true, 
    … …  
    52535252    input Temperature T "temperature"; 
    52545253    input MassFraction[:] X "vector of mass fractions"; 
    5255     output SpecificEnthalpy h "liquid enthalpy"; 
     5254    output SpecificEnthalpy h "specific enthalpy"; 
    52565255  end enthalpyOfGas; 
    52575256 
    … …  
    52605259    extends Modelica.Icons.Function; 
    52615260    input Temperature T "temperature"; 
    5262     output SpecificEnthalpy h "liquid enthalpy"; 
     5261    output SpecificEnthalpy h "specific enthalpy"; 
    52635262  end enthalpyOfCondensingGas; 
    52645263 
     5264  replaceable partial function enthalpyOfNonCondensingGas 
     5265      "Return enthalpy of the non-condensing species" 
     5266    extends Modelica.Icons.Function; 
     5267    input Temperature T "temperature"; 
     5268    output SpecificEnthalpy h "specific enthalpy"; 
     5269  end enthalpyOfNonCondensingGas; 
    52655270  end PartialCondensingGases; 
    52665271