Skip to content

Commit

Permalink
Removed a segFault and added a little more description, fixed a wrong…
Browse files Browse the repository at this point in the history
… call to the old CoolProp2Modelica

git-svn-id: https://svn.modelica.org/projects/ExternalMediaLibrary/trunk@7886 7ce873d0-865f-4ce7-a662-4bb36ea78beb
  • Loading branch information
jorrit committed Oct 14, 2014
1 parent 4724d32 commit 06b89b5
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 23 deletions.
6 changes: 6 additions & 0 deletions Installation.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,13 @@ You have to compile your own library file to use ExternalMedia on Linux.
It has been tested with Dymola, but should also work with OpenModelica
since they use the same compiler under Linux.

Please note that you have to add the dl library to the compilation if you
would like to use NIST REFPROP through the CoolProp interface. For Dymola,
you can add "-ldl" to the compilation options in the dsbuild.sh file in
/opt/dymola/insert.

Please follow the developer instructions in `Projects/CompilationHowTo.txt`
to create your own version of ExternalMedia.


## For developers and other platforms
Expand Down
2 changes: 1 addition & 1 deletion Modelica/ExternalMedia 3.2.1/Examples.mo
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ package Examples "Examples of external medium models"
end WaterCoolProp;

package DowQCoolProp "DowthermQ properties from CoolProp"
extends CoolProp2Modelica.Interfaces.IncompressibleCoolPropMedium(
extends ExternalMedia.Media.IncompressibleCoolPropMedium(
mediumName="DowQ",
substanceNames={"DowQ|calc_transport=1"},
ThermoStates=Modelica.Media.Interfaces.Choices.IndependentVariables.pT);
Expand Down
24 changes: 2 additions & 22 deletions Modelica/ExternalMedia 3.2.1/Media/IncompressibleCoolPropMedium.mo
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,8 @@ partial package IncompressibleCoolPropMedium
end FluidConstants;
constant InputChoiceIncompressible inputChoice=InputChoiceIncompressible.pTX
"Default choice of input variables for property computations, incompressibles are in p,T";
redeclare replaceable record ThermodynamicState
// Fields in ASCII lexicographical order to work in Dymola
Temperature T "temperature";
VelocityOfSound a "velocity of sound";
Modelica.SIunits.CubicExpansionCoefficient beta
"isobaric expansion coefficient";
SpecificHeatCapacity cp "specific heat capacity cp";
SpecificHeatCapacity cv "specific heat capacity cv";
Density d "density";
DerDensityByEnthalpy ddhp
"derivative of density wrt enthalpy at constant pressure";
DerDensityByPressure ddph
"derivative of density wrt pressure at constant enthalpy";
DynamicViscosity eta "dynamic viscosity";
SpecificEnthalpy h "specific enthalpy";
Modelica.SIunits.Compressibility kappa "compressibility";
ThermalConductivity lambda "thermal conductivity";
AbsolutePressure p "pressure";
FixedPhase phase(min=0, max=2)
"phase flag: 2 for two-phase, 1 for one-phase";
SpecificEntropy s "specific entropy";
end ThermodynamicState;
redeclare replaceable record ThermodynamicState =
ExternalMedia.Media.BaseClasses.ExternalTwoPhaseMedium.ThermodynamicState;

redeclare replaceable model extends BaseProperties(
p(stateSelect = if preferredMediumStates and
Expand Down

0 comments on commit 06b89b5

Please sign in to comment.