Changeset 1114 for branches

Show
Ignore:
Timestamp:
05/04/08 14:03:32 (7 months ago)
Author:
otter
Message:

Media.Interfaces.PartialSimpleMedium: Missing functions added (pressure, temperature, density, specificEnthalpy)

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/maintenance/2.2.2/Modelica/Media/package.mo

    r739 r1114  
    59025902    end thermalConductivity; 
    59035903     
     5904    redeclare function extends pressure "Return pressure"  
     5905       
     5906    annotation(Documentation(info="<html></html>")); 
     5907    algorithm  
     5908      p := state.p; 
     5909    end pressure; 
     5910 
     5911    redeclare function extends temperature "Return temperature"  
     5912       
     5913    annotation(Documentation(info="<html></html>")); 
     5914    algorithm  
     5915      T := state.T; 
     5916    end temperature; 
     5917 
     5918    redeclare function extends density "Return density"  
     5919       
     5920    annotation(Documentation(info="<html></html>")); 
     5921    algorithm  
     5922      d := d_const; 
     5923    end density; 
     5924 
     5925    redeclare function extends specificEnthalpy "Return specific enthalpy"  
     5926       
     5927    annotation(Documentation(info="<html></html>")); 
     5928    algorithm  
     5929      h := cp_const*(state.T-T0); 
     5930    end specificEnthalpy; 
     5931 
    59045932    redeclare function extends specificHeatCapacityCp  
    59055933      "Return specific heat capacity at constant pressure"  
    … …  
    60836111    end density; 
    60846112     
    6085     redeclare function extends specificEnthalpy  
    6086         "Return specific enthalpy"  
    6087         extends Modelica.Icons.Function; 
     6113    redeclare function extends specificEnthalpy "Return specific enthalpy"  
     6114      extends Modelica.Icons.Function; 
    60886115      annotation(Documentation(info="<html></html>")); 
    60896116    algorithm  
    … …  
    60926119     
    60936120    redeclare function extends specificInternalEnergy  
    6094         "Return specific internal energy"  
    6095         extends Modelica.Icons.Function; 
     6121      "Return specific internal energy"  
     6122      extends Modelica.Icons.Function; 
    60966123      annotation(Documentation(info="<html></html>")); 
    60976124    algorithm  
    … …  
    60996126    end specificInternalEnergy; 
    61006127     
    6101     redeclare function extends specificEntropy  
    6102         "Return specific entropy"  
    6103         extends Modelica.Icons.Function; 
     6128    redeclare function extends specificEntropy "Return specific entropy"  
     6129      extends Modelica.Icons.Function; 
    61046130      annotation(Documentation(info="<html></html>")); 
    61056131    algorithm  
    … …  
    61086134     
    61096135    redeclare function extends specificGibbsEnergy  
    6110         "Return specific Gibbs energy"  
    6111         extends Modelica.Icons.Function; 
     6136      "Return specific Gibbs energy"  
     6137      extends Modelica.Icons.Function; 
    61126138      annotation(Documentation(info="<html></html>")); 
    61136139    algorithm  
    … …  
    61166142     
    61176143    redeclare function extends specificHelmholtzEnergy  
    6118         "Return specific Helmholtz energy"  
    6119         extends Modelica.Icons.Function; 
     6144      "Return specific Helmholtz energy"  
     6145      extends Modelica.Icons.Function; 
    61206146      annotation(Documentation(info="<html></html>")); 
    61216147    algorithm