Skip to content

Commit

Permalink
Merge pull request #856 from adrpo/FixOpenModelicaLoading
Browse files Browse the repository at this point in the history
make the lib load in OpenModelica
  • Loading branch information
DaJansenGit authored Jan 20, 2020
2 parents 83e95e2 + bb7c8ec commit 2fcea03
Show file tree
Hide file tree
Showing 9 changed files with 103 additions and 6 deletions.
2 changes: 1 addition & 1 deletion AixLib/DataBase/Pumps/PumpPolynomialBased/package.order
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ Pump_DN65_H15
Pump_DN65_H1_12_V48
Pump_DN65_H1_16_V26
Pump_DN65_H1_17
Examples

Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ ExpansionValvePressureDifference
ModularExpansionValvesMassFlowRate
ModularExpansionValvesPressureDifference
StaticHeatPumpBoundaries
StaticHeatPumpBoundaries

Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,10 @@ model ModularCHP_PowerUnit "Model of modular CHP power unit"
> 0.0001 then gasolineEngineChp.cHPCombustionEngine.m_flow_Fue else 0.0001
"Fuel consumption rate of CHP unit";
type SpecificEmission=Real(final unit="g/(kW.h)", min=0.0001);
SpecificEmission b_CO2=if noEvent(abs(Q_Therm + P_El) > 0) then 3600000000*
SpecificEmission b_CO2=if noEvent(abs(Q_Therm + P_El) > 0) then 3600000000.0 *
m_flow_CO2/(Q_Therm + P_El) else 0
"Specific CO2 emissions per kWh (heat and power)";
SpecificEmission b_e=if noEvent(abs(Q_Therm + P_El) > 0) then 3600000000*
SpecificEmission b_e=if noEvent(abs(Q_Therm + P_El) > 0) then 3600000000.0 *
m_flow_Fue/(Q_Therm + P_El) else 0
"Specific fuel consumption per kWh (heat and power)";
Real FueUtiRate=(Q_Therm + P_El)/(m_flow_Fue*Medium_Fuel.H_U)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ CalcExcessTemp
HeatConvRadiator
MultiLayerThermalDelta
PressureDropRadiator
RadiatorTypes
RadiatorWall
calcHeaterExcessTemp
RadiatorTypes
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
refrigerantConstants
SmoothTransition
f_Idg
f_Res
t_fIdg_t
tt_fIdg_tt
t_fRes_t
tt_fRes_tt
d_fRes_d
dd_fRes_dd
td_fRes_td
ttt_fIdg_ttt
ttt_fRes_ttt
ddd_fRes_ddd
tdd_fRes_tdd
ttd_fRes_ttd
saturationPressure
saturationTemperature
bubbleDensity
dewDensity
bubbleEnthalpy
dewEnthalpy
bubbleEntropy
dewEntropy
temperature_ph
temperature_ps
density_pT
dynamicViscosity
thermalConductivity
surfaceTension
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
refrigerantConstants
EoS
BDSP
TSP
SmoothTransition
dynamicViscosity
thermalConductivity
surfaceTension
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
refrigerantConstants
SmoothTransition
f_Idg
f_Res
t_fIdg_t
tt_fIdg_tt
t_fRes_t
tt_fRes_tt
d_fRes_d
dd_fRes_dd
td_fRes_td
ttt_fIdg_ttt
ttt_fRes_ttt
ddd_fRes_ddd
tdd_fRes_tdd
ttd_fRes_ttd
saturationPressure
saturationTemperature
bubbleDensity
dewDensity
bubbleEnthalpy
dewEnthalpy
bubbleEntropy
dewEntropy
temperature_ph
temperature_ps
density_pT
dynamicViscosity
thermalConductivity
surfaceTension
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
refrigerantConstants
SmoothTransition
f_Idg
f_Res
t_fIdg_t
tt_fIdg_tt
t_fRes_t
tt_fRes_tt
d_fRes_d
dd_fRes_dd
td_fRes_td
ttt_fIdg_ttt
ttt_fRes_ttt
ddd_fRes_ddd
tdd_fRes_tdd
ttd_fRes_ttd
saturationPressure
saturationTemperature
bubbleDensity
dewDensity
bubbleEnthalpy
dewEnthalpy
bubbleEntropy
dewEntropy
temperature_ph
temperature_ps
density_pT
dynamicViscosity
thermalConductivity
surfaceTension
2 changes: 1 addition & 1 deletion AixLib/package.mo
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package AixLib
NcDataReader2(version="2.5.0"),
SDF(version="0.4.1"),
Modelica_DeviceDrivers(version="1.7.0")),
version = "0.9.0",
version = "0.9.1",
conversion(from(
version="0.3.2", script="modelica://AixLib/Resources/Scripts/ConvertAixLib_from_0.3.2_to_0.4.mos",
Expand Down

0 comments on commit 2fcea03

Please sign in to comment.