From 314764e51dafd7a95ac1a591942e6a9395c66676 Mon Sep 17 00:00:00 2001 From: jelgerjansen Date: Tue, 4 Feb 2025 12:58:56 +0100 Subject: [PATCH 1/4] Remove "import Modelica.Units.SI" and update SI unit references in relevant models --- IDEAS/Airflow/AHU/Examples/Adsolair58.mo | 2 +- .../Airflow/Multizone/CrackOrOperableDoor.mo | 6 +-- .../ConductiveHeatTransfer/MonoLayer.mo | 2 +- .../ConductiveHeatTransfer/MultiLayer.mo | 2 +- .../RectangularZoneTemplateInterface.mo | 38 +++++++++---------- .../Components/Validations/WindowEN673.mo | 6 +-- IDEAS/Buildings/Components/Window.mo | 6 +-- IDEAS/Buildings/Examples/ScreenComparison.mo | 2 +- .../Interfaces/Partial_Ctrl_Heating.mo | 10 ++--- .../Distribution/AC/Components/Grid_3P.mo | 2 +- .../Photovoltaics/Examples/PVSystem.mo | 4 +- .../Examples/Thermostatic3WayValve.mo | 2 +- .../HeatPumps/Examples/HeatPump_WaterWater.mo | 2 +- .../Examples/HeatPump_WaterWaterTSet.mo | 2 +- .../Examples/HeatPump_perfFromTout.mo | 2 +- IDEAS/Fluid/HeatPumps/HP_AirWater_TSet.mo | 2 +- .../PartialDynamicHeaterWithLosses.mo | 4 +- IDEAS/Fluid/Taps/Interfaces/BalancedTap.mo | 2 +- IDEAS/package.mo | 1 - 19 files changed, 48 insertions(+), 49 deletions(-) diff --git a/IDEAS/Airflow/AHU/Examples/Adsolair58.mo b/IDEAS/Airflow/AHU/Examples/Adsolair58.mo index 2cfc117ba..e52d99eab 100644 --- a/IDEAS/Airflow/AHU/Examples/Adsolair58.mo +++ b/IDEAS/Airflow/AHU/Examples/Adsolair58.mo @@ -7,7 +7,7 @@ model Adsolair58 "Adsolair58 example model" replaceable package Medium = IDEAS.Media.Air; replaceable package MediumWater = IDEAS.Media.Water "Heating medium"; parameter Modelica.Units.SI.Pressure dp_nominal=100 "Constant output value"; - parameter SI.MassFlowRate m_flow_nominal=0.3 "Nominal air mass flow rate"; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.3 "Nominal air mass flow rate"; Adsolair58HeaCoi adsolair58( redeclare package MediumAir = Medium, redeclare BaseClasses.Adsolair14200 per, diff --git a/IDEAS/Airflow/Multizone/CrackOrOperableDoor.mo b/IDEAS/Airflow/Multizone/CrackOrOperableDoor.mo index 9a0b7d28e..18104aaf7 100644 --- a/IDEAS/Airflow/Multizone/CrackOrOperableDoor.mo +++ b/IDEAS/Airflow/Multizone/CrackOrOperableDoor.mo @@ -35,9 +35,9 @@ model CrackOrOperableDoor parameter Modelica.Units.SI.Length h_a1 = 0 "Height at port a1(hasCavity=false)"; parameter Modelica.Units.SI.Length h_a2 "Height at port a2(hasCavity=false)"; - parameter SI.Length hA=(h_a1 + h_b2)/2 + parameter Modelica.Units.SI.Length hA=(h_a1 + h_b2)/2 "Height of reference pressure at port a1 for opening (hasCavity=true) model"; - parameter SI.Length hB=(h_a2 + h_b1)/2 + parameter Modelica.Units.SI.Length hB=(h_a2 + h_b1)/2 "Height of reference pressure at port b1 for opening (hasCavity=true) model"; final parameter Real CDCloRat(min=0, max=1)=1 @@ -165,7 +165,7 @@ model CrackOrOperableDoor "Door constantly opened" annotation ( Placement(visible = true, transformation(origin = {-54, -14}, extent = {{-6, -6}, {6, 6}}, rotation = 0))); - parameter SI.Angle inc=Modelica.Constants.pi/2 + parameter Modelica.Units.SI.Angle inc=Modelica.Constants.pi/2 "inclination angle (vertical=pi/2)"; initial equation assert( not (interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts and useDoor and use_y), diff --git a/IDEAS/Buildings/Components/BaseClasses/ConductiveHeatTransfer/MonoLayer.mo b/IDEAS/Buildings/Components/BaseClasses/ConductiveHeatTransfer/MonoLayer.mo index a7f710eba..c9135fe0f 100644 --- a/IDEAS/Buildings/Components/BaseClasses/ConductiveHeatTransfer/MonoLayer.mo +++ b/IDEAS/Buildings/Components/BaseClasses/ConductiveHeatTransfer/MonoLayer.mo @@ -73,7 +73,7 @@ protected "True when a convection + radiation equation should be used to model the layer instead of conduction"; public - parameter SI.TemperatureDifference dT_nom_air=1 + parameter Modelica.Units.SI.TemperatureDifference dT_nom_air=1 "Nominal temperature difference for air layers, used for linearising Rayleigh number"; equation connect(E_internal, monLayDyn.E); diff --git a/IDEAS/Buildings/Components/BaseClasses/ConductiveHeatTransfer/MultiLayer.mo b/IDEAS/Buildings/Components/BaseClasses/ConductiveHeatTransfer/MultiLayer.mo index 5035dc6d5..7ac9f3f3c 100644 --- a/IDEAS/Buildings/Components/BaseClasses/ConductiveHeatTransfer/MultiLayer.mo +++ b/IDEAS/Buildings/Components/BaseClasses/ConductiveHeatTransfer/MultiLayer.mo @@ -27,7 +27,7 @@ model MultiLayer "multiple material layers in series" parameter Boolean disableInitPortB= false "Remove initial equation at port b" annotation(Evaluate=true, Dialog(group="Dynamics")); - parameter SI.TemperatureDifference dT_nom_air=1 + parameter Modelica.Units.SI.TemperatureDifference dT_nom_air=1 "Nominal temperature difference for air layers, used for linearising Rayleigh number" annotation(Dialog(enable=linIntCon)); parameter Boolean checkCoatings = false diff --git a/IDEAS/Buildings/Components/Interfaces/RectangularZoneTemplateInterface.mo b/IDEAS/Buildings/Components/Interfaces/RectangularZoneTemplateInterface.mo index ef030fe99..0138b5f2d 100644 --- a/IDEAS/Buildings/Components/Interfaces/RectangularZoneTemplateInterface.mo +++ b/IDEAS/Buildings/Components/Interfaces/RectangularZoneTemplateInterface.mo @@ -202,7 +202,7 @@ partial model RectangularZoneTemplateInterface parameter Interfaces.WindowDynamicsType windowDynamicsType=IDEAS.Buildings.Components.Interfaces.WindowDynamicsType.Two "Type of dynamics for glazings and frames: using zero, one combined or two states" annotation(Dialog(group="Windows", tab="Advanced")); - parameter SI.TemperatureDifference dT_nominal_win=-3 + parameter Modelica.Units.SI.TemperatureDifference dT_nominal_win=-3 "Nominal temperature difference used for linearisation, negative temperatures indicate the solid is colder" annotation(Dialog(group="Convective heat transfer", tab="Advanced")); parameter Boolean linExtCon=sim.linExtCon @@ -215,35 +215,35 @@ partial model RectangularZoneTemplateInterface "= true, if exterior radiative heat transfer for windows should be linearised" annotation(Dialog(tab="Advanced", group="Radiative heat exchange")); - parameter SI.TemperatureDifference dT_nominal_bou=-1 + parameter Modelica.Units.SI.TemperatureDifference dT_nominal_bou=-1 "Nominal temperature difference for boundary walls, used for linearisation, negative temperatures indicate the solid is colder" annotation(Dialog(tab="Advanced", group="Convective heat transfer")); - parameter SI.TemperatureDifference dT_nominal_out=-3 + parameter Modelica.Units.SI.TemperatureDifference dT_nominal_out=-3 "Nominal temperature difference for outer walls, used for linearisation, negative temperatures indicate the solid is colder" annotation(Dialog(tab="Advanced", group="Convective heat transfer")); - parameter SI.TemperatureDifference dT_nominal_sla=-3 + parameter Modelica.Units.SI.TemperatureDifference dT_nominal_sla=-3 "Nominal temperature difference of slab on ground, used for linearisation, negative temperatures indicate the solid is colder" annotation(Dialog(tab="Advanced", group="Convective heat transfer")); - parameter SI.Temperature TeAvg=273.15 + 10.8 + parameter Modelica.Units.SI.Temperature TeAvg=273.15 + 10.8 "Annual average outdoor temperature" annotation(Dialog(tab="Floor", group="Slab on ground", enable=(bouTypFlo == IDEAS.Buildings.Components.Interfaces.BoundaryType.SlabOnGround))); - parameter SI.Temperature TiAvg=273.15 + 22 + parameter Modelica.Units.SI.Temperature TiAvg=273.15 + 22 "Annual average indoor temperature" annotation(Dialog(tab="Floor", group="Slab on ground", enable=(bouTypFlo == IDEAS.Buildings.Components.Interfaces.BoundaryType.SlabOnGround))); - parameter SI.TemperatureDifference dTeAvg=4 + parameter Modelica.Units.SI.TemperatureDifference dTeAvg=4 "Amplitude of variation of monthly average outdoor temperature" annotation(Dialog(tab="Floor", group="Slab on ground", enable=(bouTypFlo == IDEAS.Buildings.Components.Interfaces.BoundaryType.SlabOnGround))); - parameter SI.TemperatureDifference dTiAvg=2 + parameter Modelica.Units.SI.TemperatureDifference dTiAvg=2 "Amplitude of variation of monthly average indoor temperature" annotation(Dialog(tab="Floor", group="Slab on ground", enable=(bouTypFlo == IDEAS.Buildings.Components.Interfaces.BoundaryType.SlabOnGround))); parameter Modelica.Units.SI.Temperature T_start_gro[3]=fill(TeAvg, 3) "Initial temperatures of the ground layers (with first value = deepest layer and last value = shallowest layer" annotation(Evaluate=true,Dialog(tab="Floor", group="Slab on ground", enable=(bouTypFlo == IDEAS.Buildings.Components.Interfaces.BoundaryType.SlabOnGround))); - parameter SI.TemperatureDifference dT_nominal_intA=1 + parameter Modelica.Units.SI.TemperatureDifference dT_nominal_intA=1 "Nominal temperature difference between zone air and interior walls, used for linearisation" annotation(Dialog(tab="Advanced", group="Convective heat transfer")); - parameter SI.TemperatureDifference dT_nominal_intB=1 + parameter Modelica.Units.SI.TemperatureDifference dT_nominal_intB=1 "Nominal temperature difference between interior walls exterior connection, used for linearisation" annotation(Dialog(tab="Advanced", group="Convective heat transfer")); replaceable parameter IDEAS.Buildings.Data.Constructions.CavityWall conTypA @@ -496,40 +496,40 @@ partial model RectangularZoneTemplateInterface parameter Boolean hasBuildingShadeA=false "=true, to enable computation of shade cast by opposite building or object on OuterWall" annotation(Dialog(tab="Face A", group="Building shade", enable=(bouTypA==IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall))); - parameter SI.Length LShaA=0 + parameter Modelica.Units.SI.Length LShaA=0 "Distance between shading object and wall, perpendicular to wall" annotation(Dialog(enable=hasBuildingShadeA,tab="Face A", group="Building shade")); - parameter SI.Length dhShaA=0 + parameter Modelica.Units.SI.Length dhShaA=0 "Height difference between top of shading object and top of wall A" annotation(Dialog(enable=hasBuildingShadeA,tab="Face A", group="Building shade")); parameter Boolean hasBuildingShadeB=false "=true, to enable computation of shade cast by opposite building or object on OuterWall" annotation(Dialog(tab="Face B", group="Building shade", enable=(bouTypB==IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall))); - parameter SI.Length LShaB=0 + parameter Modelica.Units.SI.Length LShaB=0 "Distance between shading object and wall, perpendicular to wall" annotation(Dialog(enable=hasBuildingShadeB,tab="Face B", group="Building shade")); - parameter SI.Length dhShaB=0 + parameter Modelica.Units.SI.Length dhShaB=0 "Height difference between top of shading object and top of wall B" annotation(Dialog(enable=hasBuildingShadeB,tab="Face B", group="Building shade")); parameter Boolean hasBuildingShadeC=false "=true, to enable computation of shade cast by opposite building or object on OuterWall" annotation(Dialog(tab="Face C", group="Building shade", enable=(bouTypC==IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall))); - parameter SI.Length LShaC=0 + parameter Modelica.Units.SI.Length LShaC=0 "Distance between shading object and wall, perpendicular to wall" annotation(Dialog(enable=hasBuildingShadeC,tab="Face C", group="Building shade")); - parameter SI.Length dhShaC=0 + parameter Modelica.Units.SI.Length dhShaC=0 "Height difference between top of shading object and top of wall C" annotation(Dialog(enable=hasBuildingShadeC,tab="Face C", group="Building shade")); parameter Boolean hasBuildingShadeD=false "=true, to enable computation of shade cast by opposite building or object on OuterWall" annotation(Dialog(tab="Face D", group="Building shade", enable=(bouTypD==IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall))); - parameter SI.Length LShaD=0 + parameter Modelica.Units.SI.Length LShaD=0 "Distance between shading object and wall, perpendicular to wall" annotation(Dialog(enable=hasBuildingShadeD,tab="Face D", group="Building shade")); - parameter SI.Length dhShaD=0 + parameter Modelica.Units.SI.Length dhShaD=0 "Height difference between top of shading object and top of wall D" annotation(Dialog(enable=hasBuildingShadeD,tab="Face D", group="Building shade")); - parameter SI.Length PWall = (if hasOutA then lA else 0) + (if hasOutB then lB else 0) + (if hasOutC then lC else 0) + (if hasOutD then lD else 0) + parameter Modelica.Units.SI.Length PWall = (if hasOutA then lA else 0) + (if hasOutB then lB else 0) + (if hasOutC then lC else 0) + (if hasOutD then lD else 0) "Total floor slab perimeter length" annotation(Dialog(tab="Advanced", group="SlabOnGround", enable=(bouTypFlo == IDEAS.Buildings.Components.Interfaces.BoundaryType.SlabOnGround))); diff --git a/IDEAS/Buildings/Components/Validations/WindowEN673.mo b/IDEAS/Buildings/Components/Validations/WindowEN673.mo index 87d6115b4..183593768 100644 --- a/IDEAS/Buildings/Components/Validations/WindowEN673.mo +++ b/IDEAS/Buildings/Components/Validations/WindowEN673.mo @@ -6,9 +6,9 @@ model WindowEN673 "Verifies U value of a glazing record" annotation (Placement(transformation(extent={{-100,80},{-80,100}}))); replaceable package Medium = IDEAS.Media.Air "Air medium"; - parameter SI.Temperature TZone=273.15 + 20 + parameter Modelica.Units.SI.Temperature TZone=273.15 + 20 "Fixed interior temperature"; - parameter SI.Temperature TOut=273.15 + parameter Modelica.Units.SI.Temperature TOut=273.15 "Fixed exterior temperature"; Modelica.Units.SI.CoefficientOfHeatTransfer U_EN673=windowEN673.layMul.port_a.Q_flow @@ -107,7 +107,7 @@ protected TBlaSkySou=IDEAS.BoundaryConditions.Types.DataSource.Parameter, TBlaSky=TDryBulFixed)); - parameter SI.Temperature TDryBulFixed=293.15 + parameter Modelica.Units.SI.Temperature TDryBulFixed=293.15 "Dry bulb temperature (used if TDryBul=Parameter)"; end SimInfoManagerFixedBC; initial equation diff --git a/IDEAS/Buildings/Components/Window.mo b/IDEAS/Buildings/Components/Window.mo index ae6744b17..e22c910ab 100644 --- a/IDEAS/Buildings/Components/Window.mo +++ b/IDEAS/Buildings/Components/Window.mo @@ -124,16 +124,16 @@ model Window "Multipane window" parameter Boolean use_trickle_vent = false "= true, to enable trickle vent" annotation(Dialog(group="Trickle vent", tab="Airflow")); - parameter SI.MassFlowRate m_flow_nominal = 0 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0 "Nominal mass flow rate of trickle vent" annotation(Dialog(group="Trickle vent", tab="Airflow", enable=use_trickle_vent)); - parameter SI.PressureDifference dp_nominal(displayUnit="Pa") = 5 + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa") = 5 "Pressure drop at nominal mass flow rate of trickle vent" annotation(Dialog(group="Trickle vent", tab="Airflow", enable=use_trickle_vent)); parameter Boolean use_trickle_vent_control = false "=true, to enable trickle vent control input" annotation(Dialog(group="Trickle vent", tab="Airflow", enable=use_trickle_vent)); - parameter SI.Length hTrickleVent= hVertical+hRelSurfBot_a + parameter Modelica.Units.SI.Length hTrickleVent= hVertical+hRelSurfBot_a "vertical distance between the floor of the zone (top) and the trickle vent" annotation(Dialog(group="Trickle vent", tab="Airflow", enable=use_trickle_vent)); diff --git a/IDEAS/Buildings/Examples/ScreenComparison.mo b/IDEAS/Buildings/Examples/ScreenComparison.mo index 1f59a66bc..99bf45bfc 100644 --- a/IDEAS/Buildings/Examples/ScreenComparison.mo +++ b/IDEAS/Buildings/Examples/ScreenComparison.mo @@ -4,7 +4,7 @@ model ScreenComparison "Comparison between a model with and without screen" inner BoundaryConditions.SimInfoManager sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort) annotation (Placement(transformation(extent={{-100,80},{-80,100}}))); replaceable package Medium = IDEAS.Media.Air; - parameter SI.MassFlowRate m_flow_nominal = zoneWithScreen.V*1.2*ACH/3600 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = zoneWithScreen.V*1.2*ACH/3600 "Nominal mass flow rate of trickle vent"; parameter Real ACH = 1 "Ventilation air change rate"; diff --git a/IDEAS/Controls/ControlHeating/Interfaces/Partial_Ctrl_Heating.mo b/IDEAS/Controls/ControlHeating/Interfaces/Partial_Ctrl_Heating.mo index 11f305c7a..27fa57cbb 100644 --- a/IDEAS/Controls/ControlHeating/Interfaces/Partial_Ctrl_Heating.mo +++ b/IDEAS/Controls/ControlHeating/Interfaces/Partial_Ctrl_Heating.mo @@ -7,21 +7,21 @@ partial model Partial_Ctrl_Heating in order to be complete controller. */ - parameter SI.Temperature TRoo_nominal = 273.15 + 21 + parameter Modelica.Units.SI.Temperature TRoo_nominal = 273.15 + 21 "Room temperature at nominal condition"; - parameter SI.Temperature TSupNom "Nominal heating curve supply temperature"; + parameter Modelica.Units.SI.Temperature TSupNom "Nominal heating curve supply temperature"; parameter Modelica.Units.SI.TemperatureDifference dTSupRetNom=10 "Nominal difference between supply and return water temperatures"; parameter Modelica.Units.SI.TemperatureDifference dTHeaterSet(min=0) = 2 "Difference between heating curve setpoint and heater setpoint"; parameter Modelica.Units.SI.Time timeFilter=43200 "Time constant for filter on ambient temperature"; - parameter SI.Temperature TSupMin=273.15 + 30 + parameter Modelica.Units.SI.Temperature TSupMin=273.15 + 30 "Minimum supply temperature if enabled"; parameter Boolean minSup=true "true to limit the supply temperature on the lower side"; - parameter SI.TemperatureDifference dTOutHeaBal=0 "Offset for heating curve"; - parameter SI.Temperature TOut_nominal=273.15 - 8 "Outside temperature"; + parameter Modelica.Units.SI.TemperatureDifference dTOutHeaBal=0 "Offset for heating curve"; + parameter Modelica.Units.SI.Temperature TOut_nominal=273.15 - 8 "Outside temperature"; parameter Modelica.Units.SI.TemperatureDifference corFac_val=0 "correction term for TSet of the heating curve"; diff --git a/IDEAS/Experimental/Electric/Distribution/AC/Components/Grid_3P.mo b/IDEAS/Experimental/Electric/Distribution/AC/Components/Grid_3P.mo index a77878f7a..72e38a62d 100644 --- a/IDEAS/Experimental/Electric/Distribution/AC/Components/Grid_3P.mo +++ b/IDEAS/Experimental/Electric/Distribution/AC/Components/Grid_3P.mo @@ -41,7 +41,7 @@ protected Z) for i in 1:3}; parameter Modelica.Units.SI.Reactance[3,Nodes] X3={Modelica.ComplexMath.imag( Z) for i in 1:3}; - // parameter SI.ComplexVoltage[3] Vsource3={Vsource*(cos(c.pi*2*i/3)+MCM.j*sin(c.pi*2*i/6)) for i in 1:3}; + // parameter Modelica.Units.SI.ComplexVoltage[3] Vsource3={Vsource*(cos(c.pi*2*i/3)+MCM.j*sin(c.pi*2*i/6)) for i in 1:3}; //Absolute voltages at the nodes output Modelica.Units.SI.Voltage Vabs[3,Nodes]; diff --git a/IDEAS/Experimental/Electric/Photovoltaics/Examples/PVSystem.mo b/IDEAS/Experimental/Electric/Photovoltaics/Examples/PVSystem.mo index 80bf7ea4b..7cc633f1c 100644 --- a/IDEAS/Experimental/Electric/Photovoltaics/Examples/PVSystem.mo +++ b/IDEAS/Experimental/Electric/Photovoltaics/Examples/PVSystem.mo @@ -2,9 +2,9 @@ within IDEAS.Experimental.Electric.Photovoltaics.Examples; model PVSystem "Only a PV system, see python script for generating profiles from this model" extends Modelica.Icons.Example; - parameter SI.Angle inc=40/180*Modelica.Constants.pi + parameter Modelica.Units.SI.Angle inc=40/180*Modelica.Constants.pi annotation (evaluate=False); - parameter SI.Angle azi=45/180*Modelica.Constants.pi + parameter Modelica.Units.SI.Angle azi=45/180*Modelica.Constants.pi annotation (evaluate=False); IDEAS.Experimental.Electric.Photovoltaics.PVSystemGeneral pVSystemGeneral( diff --git a/IDEAS/Fluid/Actuators/Valves/Simplified/Examples/Thermostatic3WayValve.mo b/IDEAS/Fluid/Actuators/Valves/Simplified/Examples/Thermostatic3WayValve.mo index 0b32b01a6..58c3783e0 100644 --- a/IDEAS/Fluid/Actuators/Valves/Simplified/Examples/Thermostatic3WayValve.mo +++ b/IDEAS/Fluid/Actuators/Valves/Simplified/Examples/Thermostatic3WayValve.mo @@ -9,7 +9,7 @@ model Thermostatic3WayValve "Example of a thermostatic three way valve" annotation (Placement(transformation(extent={{8,8},{28,28}}))); package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater; - parameter SI.MassFlowRate m_flow_nominal=2 "Nominal mass flow rate"; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=2 "Nominal mass flow rate"; IDEAS.Fluid.Movers.FlowControlled_m_flow pump( redeclare package Medium = Medium, diff --git a/IDEAS/Fluid/HeatPumps/Examples/HeatPump_WaterWater.mo b/IDEAS/Fluid/HeatPumps/Examples/HeatPump_WaterWater.mo index a3a5db922..41a7f845c 100644 --- a/IDEAS/Fluid/HeatPumps/Examples/HeatPump_WaterWater.mo +++ b/IDEAS/Fluid/HeatPumps/Examples/HeatPump_WaterWater.mo @@ -6,7 +6,7 @@ model HeatPump_WaterWater package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater annotation (choicesAllMatching=true); - constant SI.MassFlowRate m_flow_nominal=0.3 "Nominal mass flow rate"; + constant Modelica.Units.SI.MassFlowRate m_flow_nominal=0.3 "Nominal mass flow rate"; IDEAS.Fluid.Movers.FlowControlled_m_flow pump( redeclare package Medium = Medium, tau=30, diff --git a/IDEAS/Fluid/HeatPumps/Examples/HeatPump_WaterWaterTSet.mo b/IDEAS/Fluid/HeatPumps/Examples/HeatPump_WaterWaterTSet.mo index fa19706f7..38380f22e 100644 --- a/IDEAS/Fluid/HeatPumps/Examples/HeatPump_WaterWaterTSet.mo +++ b/IDEAS/Fluid/HeatPumps/Examples/HeatPump_WaterWaterTSet.mo @@ -4,7 +4,7 @@ model HeatPump_WaterWaterTSet extends Modelica.Icons.Example; package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater annotation (choicesAllMatching=true); - constant SI.MassFlowRate m_flow_nominal=0.3 "Nominal mass flow rate"; + constant Modelica.Units.SI.MassFlowRate m_flow_nominal=0.3 "Nominal mass flow rate"; Modelica.Blocks.Sources.Constant const(k=273.15 + 35) annotation (Placement(transformation(extent={{8,24},{-10,42}}))); diff --git a/IDEAS/Fluid/HeatPumps/Examples/HeatPump_perfFromTout.mo b/IDEAS/Fluid/HeatPumps/Examples/HeatPump_perfFromTout.mo index e47d0437e..1a36d79a7 100644 --- a/IDEAS/Fluid/HeatPumps/Examples/HeatPump_perfFromTout.mo +++ b/IDEAS/Fluid/HeatPumps/Examples/HeatPump_perfFromTout.mo @@ -6,7 +6,7 @@ model HeatPump_perfFromTout package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater annotation (choicesAllMatching=true); - constant SI.MassFlowRate m_flow_nominal=0.3 "Nominal mass flow rate"; + constant Modelica.Units.SI.MassFlowRate m_flow_nominal=0.3 "Nominal mass flow rate"; IDEAS.Fluid.Movers.FlowControlled_m_flow pump( redeclare package Medium = Medium, use_riseTime=false, diff --git a/IDEAS/Fluid/HeatPumps/HP_AirWater_TSet.mo b/IDEAS/Fluid/HeatPumps/HP_AirWater_TSet.mo index ccc9524f7..c62d6018d 100644 --- a/IDEAS/Fluid/HeatPumps/HP_AirWater_TSet.mo +++ b/IDEAS/Fluid/HeatPumps/HP_AirWater_TSet.mo @@ -12,7 +12,7 @@ model HP_AirWater_TSet "Air-to-water heat pump with temperature set point" parameter Real fraLosDesNom=0.68 "Ratio of power at design conditions over power at 2/35degC"; parameter Real betaFactor=0.8 "Relative sizing compared to design heat load"; - final parameter SI.Power QNomFinal=if abs(QDesign) < Modelica.Constants.small then QNom else QDesign/ + final parameter Modelica.Units.SI.Power QNomFinal=if abs(QDesign) < Modelica.Constants.small then QNom else QDesign/ fraLosDesNom*betaFactor "Used nominal power in the heatSource model"; parameter Real modulation_min=20 "Minimal modulation percentage"; parameter Real modulation_start=35 diff --git a/IDEAS/Fluid/HeatPumps/Interfaces/PartialDynamicHeaterWithLosses.mo b/IDEAS/Fluid/HeatPumps/Interfaces/PartialDynamicHeaterWithLosses.mo index 9e62f533a..b21b9312b 100644 --- a/IDEAS/Fluid/HeatPumps/Interfaces/PartialDynamicHeaterWithLosses.mo +++ b/IDEAS/Fluid/HeatPumps/Interfaces/PartialDynamicHeaterWithLosses.mo @@ -14,8 +14,8 @@ partial model PartialDynamicHeaterWithLosses parameter Modelica.Units.SI.Mass mWater=5 "Mass of water in the condensor"; parameter Modelica.Units.SI.HeatCapacity cDry=4800 "Capacity of dry material lumped to condensor"; - parameter SI.MassFlowRate m_flow_nominal "Nominal mass flow rate"; - parameter SI.Pressure dp_nominal=0 "Pressure"; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate"; + parameter Modelica.Units.SI.Pressure dp_nominal=0 "Pressure"; parameter Boolean dynamicBalance=true "Set to true to use a dynamic balance, which often leads to smaller systems of equations" annotation (Dialog(tab="Flow resistance")); diff --git a/IDEAS/Fluid/Taps/Interfaces/BalancedTap.mo b/IDEAS/Fluid/Taps/Interfaces/BalancedTap.mo index 7bc5b99c6..23b4bafd3 100644 --- a/IDEAS/Fluid/Taps/Interfaces/BalancedTap.mo +++ b/IDEAS/Fluid/Taps/Interfaces/BalancedTap.mo @@ -9,7 +9,7 @@ partial model BalancedTap "partial DHW model" "Nominal cold water temperature"; parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; - parameter SI.Time tau=30 + parameter Modelica.Units.SI.Time tau=30 "Tin time constant of temperature sensor at nominal flow rate"; protected Modelica.Units.SI.MassFlowRate mFlo60C "DHW flow rate at 60 degC"; diff --git a/IDEAS/package.mo b/IDEAS/package.mo index 9fd6d3f27..a1b7fc1df 100644 --- a/IDEAS/package.mo +++ b/IDEAS/package.mo @@ -2,7 +2,6 @@ within ; package IDEAS "Integrated District Energy Assessment Simulation" extends Modelica.Icons.Package; -import Modelica.Units.SI; annotation ( uses(Modelica(version="4.0.0")), From 25feec9cc44226bdf442898689a286259a384da3 Mon Sep 17 00:00:00 2001 From: jelgerjansen Date: Tue, 4 Feb 2025 13:50:06 +0100 Subject: [PATCH 2/4] Remove other import statement (in Experimental/Electric) --- IDEAS/Experimental/Electric/Photovoltaics/Components/DCgen.mo | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/IDEAS/Experimental/Electric/Photovoltaics/Components/DCgen.mo b/IDEAS/Experimental/Electric/Photovoltaics/Components/DCgen.mo index 4adf0e0bb..5f782c9b3 100644 --- a/IDEAS/Experimental/Electric/Photovoltaics/Components/DCgen.mo +++ b/IDEAS/Experimental/Electric/Photovoltaics/Components/DCgen.mo @@ -1,8 +1,7 @@ within IDEAS.Experimental.Electric.Photovoltaics.Components; model DCgen - import Modelica.Electrical.Analog.Interfaces; - extends Interfaces.OnePort; + extends Modelica.Electrical.Analog.Interfaces.OnePort; annotation (Documentation(revisions="