Skip to content

Commit 2fcea03

Browse files
authored
Merge pull request #856 from adrpo/FixOpenModelicaLoading
make the lib load in OpenModelica
2 parents 83e95e2 + bb7c8ec commit 2fcea03

9 files changed

Lines changed: 103 additions & 6 deletions

File tree

AixLib/DataBase/Pumps/PumpPolynomialBased/package.order

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ Pump_DN65_H15
2424
Pump_DN65_H1_12_V48
2525
Pump_DN65_H1_16_V26
2626
Pump_DN65_H1_17
27-
Examples
27+

AixLib/Fluid/Actuators/Valves/ExpansionValves/Examples/package.order

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ ExpansionValvePressureDifference
33
ModularExpansionValvesMassFlowRate
44
ModularExpansionValvesPressureDifference
55
StaticHeatPumpBoundaries
6-
StaticHeatPumpBoundaries
6+

AixLib/Fluid/BoilerCHP/ModularCHP/BaseClasses/ModularCHP_PowerUnit.mo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ model ModularCHP_PowerUnit "Model of modular CHP power unit"
115115
> 0.0001 then gasolineEngineChp.cHPCombustionEngine.m_flow_Fue else 0.0001
116116
"Fuel consumption rate of CHP unit";
117117
type SpecificEmission=Real(final unit="g/(kW.h)", min=0.0001);
118-
SpecificEmission b_CO2=if noEvent(abs(Q_Therm + P_El) > 0) then 3600000000*
118+
SpecificEmission b_CO2=if noEvent(abs(Q_Therm + P_El) > 0) then 3600000000.0 *
119119
m_flow_CO2/(Q_Therm + P_El) else 0
120120
"Specific CO2 emissions per kWh (heat and power)";
121-
SpecificEmission b_e=if noEvent(abs(Q_Therm + P_El) > 0) then 3600000000*
121+
SpecificEmission b_e=if noEvent(abs(Q_Therm + P_El) > 0) then 3600000000.0 *
122122
m_flow_Fue/(Q_Therm + P_El) else 0
123123
"Specific fuel consumption per kWh (heat and power)";
124124
Real FueUtiRate=(Q_Therm + P_El)/(m_flow_Fue*Medium_Fuel.H_U)

AixLib/Fluid/HeatExchangers/Radiators/BaseClasses/package.order

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ CalcExcessTemp
22
HeatConvRadiator
33
MultiLayerThermalDelta
44
PressureDropRadiator
5-
RadiatorTypes
65
RadiatorWall
76
calcHeaterExcessTemp
87
RadiatorTypes
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
refrigerantConstants
2+
SmoothTransition
3+
f_Idg
4+
f_Res
5+
t_fIdg_t
6+
tt_fIdg_tt
7+
t_fRes_t
8+
tt_fRes_tt
9+
d_fRes_d
10+
dd_fRes_dd
11+
td_fRes_td
12+
ttt_fIdg_ttt
13+
ttt_fRes_ttt
14+
ddd_fRes_ddd
15+
tdd_fRes_tdd
16+
ttd_fRes_ttd
17+
saturationPressure
18+
saturationTemperature
19+
bubbleDensity
20+
dewDensity
21+
bubbleEnthalpy
22+
dewEnthalpy
23+
bubbleEntropy
24+
dewEntropy
25+
temperature_ph
26+
temperature_ps
27+
density_pT
28+
dynamicViscosity
29+
thermalConductivity
30+
surfaceTension
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
refrigerantConstants
2+
EoS
3+
BDSP
4+
TSP
5+
SmoothTransition
6+
dynamicViscosity
7+
thermalConductivity
8+
surfaceTension
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
refrigerantConstants
2+
SmoothTransition
3+
f_Idg
4+
f_Res
5+
t_fIdg_t
6+
tt_fIdg_tt
7+
t_fRes_t
8+
tt_fRes_tt
9+
d_fRes_d
10+
dd_fRes_dd
11+
td_fRes_td
12+
ttt_fIdg_ttt
13+
ttt_fRes_ttt
14+
ddd_fRes_ddd
15+
tdd_fRes_tdd
16+
ttd_fRes_ttd
17+
saturationPressure
18+
saturationTemperature
19+
bubbleDensity
20+
dewDensity
21+
bubbleEnthalpy
22+
dewEnthalpy
23+
bubbleEntropy
24+
dewEntropy
25+
temperature_ph
26+
temperature_ps
27+
density_pT
28+
dynamicViscosity
29+
thermalConductivity
30+
surfaceTension
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
refrigerantConstants
2+
SmoothTransition
3+
f_Idg
4+
f_Res
5+
t_fIdg_t
6+
tt_fIdg_tt
7+
t_fRes_t
8+
tt_fRes_tt
9+
d_fRes_d
10+
dd_fRes_dd
11+
td_fRes_td
12+
ttt_fIdg_ttt
13+
ttt_fRes_ttt
14+
ddd_fRes_ddd
15+
tdd_fRes_tdd
16+
ttd_fRes_ttd
17+
saturationPressure
18+
saturationTemperature
19+
bubbleDensity
20+
dewDensity
21+
bubbleEnthalpy
22+
dewEnthalpy
23+
bubbleEntropy
24+
dewEntropy
25+
temperature_ph
26+
temperature_ps
27+
density_pT
28+
dynamicViscosity
29+
thermalConductivity
30+
surfaceTension

AixLib/package.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package AixLib
77
NcDataReader2(version="2.5.0"),
88
SDF(version="0.4.1"),
99
Modelica_DeviceDrivers(version="1.7.0")),
10-
version = "0.9.0",
10+
version = "0.9.1",
1111
1212
conversion(from(
1313
version="0.3.2", script="modelica://AixLib/Resources/Scripts/ConvertAixLib_from_0.3.2_to_0.4.mos",

0 commit comments

Comments
 (0)