Merge pull request #856 from adrpo/FixOpenModelicaLoading

make the lib load in OpenModelica
RWTH-EBC · Jan 20, 2020 · 2fcea03 · 2fcea03
2 parents 83e95e2 + bb7c8ec
commit 2fcea03
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 6 deletions.
diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/package.order b/AixLib/DataBase/Pumps/PumpPolynomialBased/package.order
@@ -24,4 +24,4 @@ Pump_DN65_H15
 Pump_DN65_H1_12_V48
 Pump_DN65_H1_16_V26
 Pump_DN65_H1_17
-Examples
+
diff --git a/AixLib/Fluid/Actuators/Valves/ExpansionValves/Examples/package.order b/AixLib/Fluid/Actuators/Valves/ExpansionValves/Examples/package.order
@@ -3,4 +3,4 @@ ExpansionValvePressureDifference
 ModularExpansionValvesMassFlowRate
 ModularExpansionValvesPressureDifference
 StaticHeatPumpBoundaries
-StaticHeatPumpBoundaries
+
diff --git a/AixLib/Fluid/BoilerCHP/ModularCHP/BaseClasses/ModularCHP_PowerUnit.mo b/AixLib/Fluid/BoilerCHP/ModularCHP/BaseClasses/ModularCHP_PowerUnit.mo
@@ -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)

diff --git a/AixLib/Fluid/HeatExchangers/Radiators/BaseClasses/package.order b/AixLib/Fluid/HeatExchangers/Radiators/BaseClasses/package.order
@@ -2,7 +2,6 @@ CalcExcessTemp
 HeatConvRadiator
 MultiLayerThermalDelta
 PressureDropRadiator
-RadiatorTypes
 RadiatorWall
 calcHeaterExcessTemp
 RadiatorTypes
diff --git a/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_340_Formula/package.order b/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_340_Formula/package.order
@@ -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
diff --git a/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_340_Record/package.order b/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_340_Record/package.order
@@ -0,0 +1,8 @@
+refrigerantConstants
+EoS
+BDSP
+TSP
+SmoothTransition
+dynamicViscosity
+thermalConductivity
+surfaceTension
diff --git a/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_473_Formula/package.order b/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_473_Formula/package.order
@@ -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
diff --git a/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_473_Horner/package.order b/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_473_Horner/package.order
@@ -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
diff --git a/AixLib/package.mo b/AixLib/package.mo
@@ -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",