diff --git a/Annex60/Fluid/Actuators/Valves/Examples/ThreeWayValves.mo b/Annex60/Fluid/Actuators/Valves/Examples/ThreeWayValves.mo index a6dfdf1112..231808836d 100644 --- a/Annex60/Fluid/Actuators/Valves/Examples/ThreeWayValves.mo +++ b/Annex60/Fluid/Actuators/Valves/Examples/ThreeWayValves.mo @@ -10,7 +10,9 @@ model ThreeWayValves "Three way valves with different opening characteristics" l={0.05,0.05}, m_flow_nominal=2, filteredOpening=false, - dpValve_nominal=6000) "Valve model, linear opening characteristics" + dpValve_nominal=6000, + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) + "Valve model, linear opening characteristics" annotation (Placement(transformation(extent={{0,-8},{20,12}}, rotation=0))); Modelica.Blocks.Sources.Ramp y( @@ -42,7 +44,8 @@ model ThreeWayValves "Three way valves with different opening characteristics" R=10, m_flow_nominal=2, filteredOpening=false, - dpValve_nominal=6000) + dpValve_nominal=6000, + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) annotation (Placement(transformation(extent={{0,-60},{20,-40}}, rotation=0))); Annex60.Fluid.Sources.Boundary_pT ret( redeclare package Medium = Medium, diff --git a/Annex60/Fluid/Delays/Examples/Delay.mo b/Annex60/Fluid/Delays/Examples/Delay.mo index e8dce492b1..1c8c821853 100644 --- a/Annex60/Fluid/Delays/Examples/Delay.mo +++ b/Annex60/Fluid/Delays/Examples/Delay.mo @@ -39,8 +39,9 @@ model Delay rotation=0))); Annex60.Fluid.Delays.DelayFirstOrder del( m_flow_nominal=5, redeclare package Medium = Medium, - T_start=283.15, - nPorts=2) + nPorts=2, + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, + T_start=283.15) annotation (Placement(transformation(extent={{-2,6},{18,26}}, rotation=0))); inner Modelica.Fluid.System system annotation (Placement(transformation(extent={{-100,-100},{-80,-80}}))); @@ -69,5 +70,6 @@ equation -100},{100,100}}), graphics), experiment(StopTime=300), -__Dymola_Commands(file="modelica://Annex60/Resources/Scripts/Dymola/Fluid/Delays/Examples/Delay.mos" "Simulate and plot")); +__Dymola_Commands(file="modelica://Annex60/Resources/Scripts/Dymola/Fluid/Delays/Examples/Delay.mos" + "Simulate and plot")); end Delay; diff --git a/Annex60/Fluid/HeatExchangers/Radiators/Examples/RadiatorEN442_2.mo b/Annex60/Fluid/HeatExchangers/Radiators/Examples/RadiatorEN442_2.mo index 5064a878e5..c1220cd4f7 100644 --- a/Annex60/Fluid/HeatExchangers/Radiators/Examples/RadiatorEN442_2.mo +++ b/Annex60/Fluid/HeatExchangers/Radiators/Examples/RadiatorEN442_2.mo @@ -45,7 +45,8 @@ model RadiatorEN442_2 "Test model for radiator" T_a_nominal=T_a_nominal, T_b_nominal=T_b_nominal, Q_flow_nominal=Q_flow_nominal, - TAir_nominal=TRoo) "Radiator" + TAir_nominal=TRoo, + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) "Radiator" annotation (Placement(transformation(extent={{-10,-2},{10,18}}))); Annex60.Fluid.HeatExchangers.Radiators.RadiatorEN442_2 rad2( redeclare package Medium = Medium, diff --git a/Annex60/Fluid/Interfaces/Examples/ReverseFlowHumidifier.mo b/Annex60/Fluid/Interfaces/Examples/ReverseFlowHumidifier.mo index 19211957e2..ad6b9a9f91 100644 --- a/Annex60/Fluid/Interfaces/Examples/ReverseFlowHumidifier.mo +++ b/Annex60/Fluid/Interfaces/Examples/ReverseFlowHumidifier.mo @@ -17,16 +17,18 @@ package Medium = Annex60.Media.Air; dp_nominal=0, m_flow(start=1), m_flow_nominal=1, - T=283.15, - mWat_flow_nominal=0.1) "Humidifier with backward flow" + mWat_flow_nominal=0.1, + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, + T=283.15) "Humidifier with backward flow" annotation (Placement(transformation(extent={{-32,-16},{-52,4}}))); Annex60.Fluid.MassExchangers.HumidifierPrescribed humFor( redeclare package Medium = Medium, dp_nominal=0, m_flow(start=1), m_flow_nominal=1, - T=283.15, - mWat_flow_nominal=0.1) "Humidifier with forward flow" + mWat_flow_nominal=0.1, + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, + T=283.15) "Humidifier with forward flow" annotation (Placement(transformation(extent={{-50,20},{-30,40}}))); Modelica.Blocks.Sources.Constant u2(k=0.01) "Control input" annotation (Placement(transformation(extent={{-92,54},{-80,66}}))); diff --git a/Annex60/Fluid/Movers/Examples/FlowMachine_Nrpm.mo b/Annex60/Fluid/Movers/Examples/FlowMachine_Nrpm.mo index d1a9ab5083..22f480c1ce 100644 --- a/Annex60/Fluid/Movers/Examples/FlowMachine_Nrpm.mo +++ b/Annex60/Fluid/Movers/Examples/FlowMachine_Nrpm.mo @@ -7,12 +7,14 @@ model FlowMachine_Nrpm "Fan with zero mass flow rate and speed as input" redeclare package Medium = Medium, pressure(V_flow={0,m_flow_nominal,2*m_flow_nominal}/1.2, dp={2*dp_nominal,dp_nominal,0}), - filteredSpeed=false), + filteredSpeed=false, + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial), redeclare Annex60.Fluid.Movers.FlowMachine_Nrpm floMacDyn( redeclare package Medium = Medium, pressure(V_flow={0,m_flow_nominal,2*m_flow_nominal}/1.2, dp={2*dp_nominal,dp_nominal,0}), - filteredSpeed=false)); + filteredSpeed=false, + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)); equation connect(gain.y, floMacSta.Nrpm) annotation (Line( diff --git a/Annex60/Fluid/Movers/Examples/FlowMachine_dp.mo b/Annex60/Fluid/Movers/Examples/FlowMachine_dp.mo index 7c038a0fe7..b6662b2891 100644 --- a/Annex60/Fluid/Movers/Examples/FlowMachine_dp.mo +++ b/Annex60/Fluid/Movers/Examples/FlowMachine_dp.mo @@ -6,11 +6,13 @@ model FlowMachine_dp "Fan with zero mass flow rate and head as input" redeclare Annex60.Fluid.Movers.FlowMachine_dp floMacSta( redeclare package Medium = Medium, m_flow_nominal=m_flow_nominal, - filteredSpeed=false), + filteredSpeed=false, + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial), redeclare Annex60.Fluid.Movers.FlowMachine_dp floMacDyn( redeclare package Medium = Medium, m_flow_nominal=m_flow_nominal, - filteredSpeed=false)); + filteredSpeed=false, + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)); equation connect(gain.y, floMacSta.dp_in) annotation (Line( diff --git a/Annex60/Fluid/Movers/Examples/FlowMachine_m_flow.mo b/Annex60/Fluid/Movers/Examples/FlowMachine_m_flow.mo index c6b737b9b6..5010d6cd18 100644 --- a/Annex60/Fluid/Movers/Examples/FlowMachine_m_flow.mo +++ b/Annex60/Fluid/Movers/Examples/FlowMachine_m_flow.mo @@ -7,11 +7,13 @@ model FlowMachine_m_flow redeclare Annex60.Fluid.Movers.FlowMachine_m_flow floMacSta( redeclare package Medium = Medium, m_flow_nominal=m_flow_nominal, - filteredSpeed=false), + filteredSpeed=false, + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial), redeclare Annex60.Fluid.Movers.FlowMachine_m_flow floMacDyn( redeclare package Medium = Medium, m_flow_nominal=m_flow_nominal, - filteredSpeed=false)); + filteredSpeed=false, + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)); equation connect(gain.y, floMacSta.m_flow_in) annotation (Line( diff --git a/Annex60/Fluid/Movers/Examples/FlowMachine_y.mo b/Annex60/Fluid/Movers/Examples/FlowMachine_y.mo index b5255e94b6..f73c97edf8 100644 --- a/Annex60/Fluid/Movers/Examples/FlowMachine_y.mo +++ b/Annex60/Fluid/Movers/Examples/FlowMachine_y.mo @@ -8,12 +8,14 @@ model FlowMachine_y redeclare package Medium = Medium, pressure(V_flow={0,m_flow_nominal,2*m_flow_nominal}/1.2, dp={2*dp_nominal,dp_nominal,0}), - filteredSpeed=false), + filteredSpeed=false, + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial), redeclare Annex60.Fluid.Movers.FlowMachine_y floMacDyn( redeclare package Medium = Medium, pressure(V_flow={0,m_flow_nominal,2*m_flow_nominal}/1.2, dp={2*dp_nominal,dp_nominal,0}), - filteredSpeed=false)); + filteredSpeed=false, + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)); equation connect(gain.y, floMacDyn.y) annotation (Line( diff --git a/Annex60/Fluid/Sensors/Examples/MassFraction.mo b/Annex60/Fluid/Sensors/Examples/MassFraction.mo index 10213bac12..b9205148eb 100644 --- a/Annex60/Fluid/Sensors/Examples/MassFraction.mo +++ b/Annex60/Fluid/Sensors/Examples/MassFraction.mo @@ -27,7 +27,8 @@ model MassFraction "Test model for the mass fraction sensor" redeclare package Medium = Medium, V=1, nPorts=3, - m_flow_nominal=10) "Volume" + m_flow_nominal=10, + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) "Volume" annotation (Placement(transformation(extent={{0,10},{20,30}}))); Annex60.Fluid.FixedResistances.FixedResistanceDpM dp( redeclare package Medium = Medium,