From 5bc0c34749fc832e69ca0e0667e37b186c2f7961 Mon Sep 17 00:00:00 2001 From: hcasperfu Date: Wed, 28 Aug 2024 09:50:58 -0700 Subject: [PATCH 1/3] deleted Nrpm models from Obsolete --- .../Movers/BaseClasses/PartialFlowMachine.mo | 815 ------------------ .../Fluid/Movers/BaseClasses/package.mo | 11 - .../Fluid/Movers/BaseClasses/package.order | 1 - IBPSA/Obsolete/Fluid/Movers/Data/Generic.mo | 300 ------- .../Data/Pumps/Wilo/Stratos25slash1to4.mo | 69 -- .../Data/Pumps/Wilo/Stratos32slash1to12.mo | 68 -- .../Fluid/Movers/Data/Pumps/Wilo/package.mo | 10 - .../Movers/Data/Pumps/Wilo/package.order | 2 - .../Fluid/Movers/Data/Pumps/package.mo | 15 - .../Fluid/Movers/Data/Pumps/package.order | 1 - IBPSA/Obsolete/Fluid/Movers/Data/package.mo | 15 - .../Obsolete/Fluid/Movers/Data/package.order | 2 - .../Fluid/Movers/Examples/MoverContinuous.mo | 58 -- .../Fluid/Movers/Examples/MoverParameter.mo | 126 --- .../Fluid/Movers/Examples/MoverStages.mo | 68 -- .../Obsolete/Fluid/Movers/Examples/package.mo | 9 - .../Fluid/Movers/Examples/package.order | 3 - .../Preconfigured/SpeedControlled_Nrpm.mo | 61 -- .../ControlledFlowMachinePreconfigured.mo | 63 -- .../Preconfigured/Validation/package.mo | 20 - .../Preconfigured/Validation/package.order | 1 - .../Fluid/Movers/Preconfigured/package.mo | 13 - .../Fluid/Movers/Preconfigured/package.order | 2 - .../Fluid/Movers/SpeedControlled_Nrpm.mo | 197 ----- .../BaseClasses/ControlledFlowMachine.mo | 226 ----- .../Movers/Validation/BaseClasses/package.mo | 9 - .../Validation/BaseClasses/package.order | 1 - .../Validation/ControlledFlowMachine.mo | 37 - .../ControlledFlowMachineDynamic.mo | 30 - .../Movers/Validation/SpeedControlled_Nrpm.mo | 58 -- .../Fluid/Movers/Validation/package.order | 4 - IBPSA/Obsolete/Fluid/Movers/package.order | 5 - 32 files changed, 2300 deletions(-) delete mode 100644 IBPSA/Obsolete/Fluid/Movers/BaseClasses/PartialFlowMachine.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/BaseClasses/package.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/BaseClasses/package.order delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Data/Generic.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/Stratos25slash1to4.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/Stratos32slash1to12.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/package.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/package.order delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Data/Pumps/package.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Data/Pumps/package.order delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Data/package.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Data/package.order delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Examples/MoverContinuous.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Examples/MoverParameter.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Examples/MoverStages.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Examples/package.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Examples/package.order delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Preconfigured/SpeedControlled_Nrpm.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/ControlledFlowMachinePreconfigured.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/package.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/package.order delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Preconfigured/package.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Preconfigured/package.order delete mode 100644 IBPSA/Obsolete/Fluid/Movers/SpeedControlled_Nrpm.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/package.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/package.order delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Validation/ControlledFlowMachine.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mo delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Validation/SpeedControlled_Nrpm.mo diff --git a/IBPSA/Obsolete/Fluid/Movers/BaseClasses/PartialFlowMachine.mo b/IBPSA/Obsolete/Fluid/Movers/BaseClasses/PartialFlowMachine.mo deleted file mode 100644 index 8521e6e7de..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/BaseClasses/PartialFlowMachine.mo +++ /dev/null @@ -1,815 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers.BaseClasses; -partial model PartialFlowMachine - "Partial model to interface fan or pump models with the medium" - extends IBPSA.Obsolete.BaseClasses.ObsoleteModel; - extends IBPSA.Fluid.Interfaces.LumpedVolumeDeclarations( - final massDynamics=energyDynamics, - final mSenFac=1); - extends IBPSA.Fluid.Interfaces.PartialTwoPort( - port_a( - p(start=Medium.p_default), - h_outflow(start=h_outflow_start)), - port_b( - p(start=p_start), - h_outflow(start=h_outflow_start))); - - replaceable parameter IBPSA.Obsolete.Fluid.Movers.Data.Generic per - constrainedby IBPSA.Obsolete.Fluid.Movers.Data.Generic - "Record with performance data" - annotation (choicesAllMatching=true, - Placement(transformation(extent={{52,60},{72,80}}))); - - parameter IBPSA.Fluid.Types.InputType inputType = IBPSA.Fluid.Types.InputType.Continuous - "Control input type" - annotation(Dialog( - group="Control")); - parameter Real constInput = 0 "Constant input set point" - annotation(Dialog( - group="Control", - enable=inputType == IBPSA.Fluid.Types.InputType.Constant)); - parameter Real stageInputs[:] - "Vector of input set points corresponding to stages" - annotation(Dialog( - group="Control", - enable=inputType == IBPSA.Fluid.Types.InputType.Stages)); - - parameter Boolean computePowerUsingSimilarityLaws - "= true, compute power exactly, using similarity laws. Otherwise approximate."; - - parameter Boolean addPowerToMedium=true - "Set to false to avoid any power (=heat and flow work) being added to medium (may give simpler equations)"; - - parameter Boolean nominalValuesDefineDefaultPressureCurve = false - "Set to true to avoid warning if m_flow_nominal and dp_nominal are used to construct the default pressure curve"; - - parameter Modelica.Units.SI.Time tau=1 - "Time constant of fluid volume for nominal flow, used if energy or mass balance is dynamic" - annotation (Dialog( - tab="Dynamics", - group="Nominal condition", - enable=energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState)); - - // Classes used to implement the filtered speed - parameter Boolean use_inputFilter=true - "= true, if speed is filtered with a 2nd order CriticalDamping filter" - annotation(Dialog(tab="Dynamics", group="Filtered speed")); - parameter Modelica.Units.SI.Time riseTime=30 - "Rise time of the filter (time to reach 99.6 % of the speed)" annotation ( - Dialog( - tab="Dynamics", - group="Filtered speed", - enable=use_inputFilter)); - parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput - "Type of initialization (no init/steady state/initial state/initial output)" - annotation(Dialog(tab="Dynamics", group="Filtered speed",enable=use_inputFilter)); - - // Connectors and ports - Modelica.Blocks.Interfaces.IntegerInput stage - if inputType == IBPSA.Fluid.Types.InputType.Stages - "Stage input signal for the pressure head" - annotation (Placement( - transformation( - extent={{-20,-20},{20,20}}, - rotation=270, - origin={0,120}))); - - Modelica.Blocks.Interfaces.RealOutput y_actual( - final unit="1") - "Actual normalised fan or pump speed that is used for computations" - annotation (Placement(transformation(extent={{100,60},{120,80}}), - iconTransformation(extent={{100,60},{120,80}}))); - - Modelica.Blocks.Interfaces.RealOutput P( - quantity="Power", - final unit="W") "Electrical power consumed" - annotation (Placement(transformation(extent={{100,80},{120,100}}), - iconTransformation(extent={{100,80},{120,100}}))); - - Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heatPort - "Heat dissipation to environment" - annotation (Placement(transformation(extent={{-70,-110},{-50,-90}}), - iconTransformation(extent={{-10,-78},{10,-58}}))); - - // Variables - Modelica.Units.SI.VolumeFlowRate VMachine_flow(start=_VMachine_flow) = eff.V_flow - "Volume flow rate"; - Modelica.Units.SI.PressureDifference dpMachine(displayUnit="Pa") = -preSou.dp - "Pressure difference"; - - Real eta(unit="1", final quantity="Efficiency") = eff.eta "Global efficiency"; - Real etaHyd(unit="1", final quantity="Efficiency") = eff.etaHyd "Hydraulic efficiency"; - Real etaMot(unit="1", final quantity="Efficiency") = eff.etaMot "Motor efficiency"; - - // Quantity to control - - // Copied from Fluid.Interfaces.PartialTwoPortInterface - parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*abs( - _m_flow_nominal) "Small mass flow rate for regularization of zero flow" - annotation (Dialog(tab="Advanced")); - // Diagnostics - parameter Boolean show_T = false - "= true, if actual temperature at port is computed" - annotation ( - Dialog(tab="Advanced", group="Diagnostics"), - HideResult=true); - - Modelica.Units.SI.MassFlowRate m_flow(start=_m_flow_start) = port_a.m_flow - "Mass flow rate from port_a to port_b (m_flow > 0 is design flow direction)"; - - Modelica.Units.SI.PressureDifference dp( - start=_dp_start, - displayUnit="Pa") = port_a.p - port_b.p - "Pressure difference between port_a and port_b"; - - Medium.ThermodynamicState sta_a= - if allowFlowReversal then - Medium.setState_phX(port_a.p, - noEvent(actualStream(port_a.h_outflow)), - noEvent(actualStream(port_a.Xi_outflow))) - else - Medium.setState_phX(port_a.p, - noEvent(inStream(port_a.h_outflow)), - noEvent(inStream(port_a.Xi_outflow))) - if show_T "Medium properties in port_a"; - - Medium.ThermodynamicState sta_b= - if allowFlowReversal then - Medium.setState_phX(port_b.p, - noEvent(actualStream(port_b.h_outflow)), - noEvent(actualStream(port_b.Xi_outflow))) - else - Medium.setState_phX(port_b.p, - noEvent(port_b.h_outflow), - noEvent(port_b.Xi_outflow)) - if show_T "Medium properties in port_b"; - // - Copy continues in protected section - -protected - parameter Modelica.Units.SI.MassFlowRate _m_flow_nominal= - max(eff.per.pressure.V_flow)*rho_default - "Nominal mass flow rate"; - - // Copied from Fluid.Interfaces.PartialTwoPortInterface - final parameter Modelica.Units.SI.MassFlowRate _m_flow_start=0 - "Start value for m_flow, used to avoid a warning if not set in m_flow, and to avoid m_flow.start in parameter window"; - final parameter Modelica.Units.SI.PressureDifference _dp_start(displayUnit= - "Pa") = 0 - "Start value for dp, used to avoid a warning if not set in dp, and to avoid dp.start in parameter window"; - // - End of copy - - final parameter Modelica.Units.SI.VolumeFlowRate _VMachine_flow=0 - "Start value for VMachine_flow, used to avoid a warning if not specified"; - - parameter IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable preVar "Type of prescribed variable"; - - // The parameter speedIsInput is required to conditionally remove the instance gain. - // If the conditional removal of this instance where to use the test - // preVar == IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.Speed, - // then OpenModelica fails to translate the model with the message - // .../PartialFlowMachine.mo:185:3-189:70:writable] - // Error: Variable Types.PrescribedVariable.Speed not found in scope - // IBPSA.Fluid.Movers.SpeedControlled_y$floMac1. - final parameter Boolean speedIsInput= - (preVar == IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.Speed) - "Parameter that is true if speed is the controlled variables"; - - final parameter Integer nOri = size(per.pressure.V_flow, 1) - "Number of data points for pressure curve" - annotation(Evaluate=true); - - final parameter Boolean haveVMax = eff.haveVMax - "Flag, true if user specified data that contain V_flow_max"; - - final parameter Modelica.Units.SI.VolumeFlowRate V_flow_max=eff.V_flow_max; - final parameter Modelica.Units.SI.Density rho_default= - Medium.density_pTX( - p=Medium.p_default, - T=Medium.T_default, - X=Medium.X_default) "Default medium density"; - - final parameter Medium.ThermodynamicState sta_start=Medium.setState_pTX( - T=T_start, - p=p_start, - X=X_start) "Medium state at start values"; - - final parameter Modelica.Units.SI.SpecificEnthalpy h_outflow_start= - Medium.specificEnthalpy(sta_start) "Start value for outflowing enthalpy"; - - final parameter Modelica.Units.SI.Frequency fCut=5/(2*Modelica.Constants.pi* - riseTime) "Cut-off frequency of filter"; - - Modelica.Blocks.Sources.Constant[size(stageInputs, 1)] stageValues( - final k=stageInputs) - if inputType == IBPSA.Fluid.Types.InputType.Stages "Stage input values" - annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); - Modelica.Blocks.Sources.Constant setConst( - final k=constInput) - if inputType == IBPSA.Fluid.Types.InputType.Constant - "Constant input set point" - annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); - - Extractor extractor(final nin=size(stageInputs,1)) - if inputType == IBPSA.Fluid.Types.InputType.Stages "Stage input extractor" - annotation (Placement(transformation(extent={{-50,60},{-30,40}}))); - - Modelica.Blocks.Routing.RealPassThrough inputSwitch - "Dummy connection for easy connection of input options" - annotation ( - Placement(transformation( - extent={{-10,-10},{10,10}}, - origin={-10,50}))); - - IBPSA.Fluid.Delays.DelayFirstOrder vol( - redeclare final package Medium = Medium, - final tau=tau, - final energyDynamics=energyDynamics, - final T_start=T_start, - final X_start=X_start, - final C_start=C_start, - final m_flow_nominal=_m_flow_nominal, - final m_flow_small=m_flow_small, - final p_start=p_start, - final prescribedHeatFlowRate=true, - final allowFlowReversal=allowFlowReversal, - nPorts=2) "Fluid volume for dynamic model" - annotation (Placement(transformation(extent={{-70,0},{-90,20}}))); - - IBPSA.Fluid.BaseClasses.ActuatorFilter filter( - final n=2, - final f=fCut, - final normalized=true, - final initType=init) if use_inputFilter - "Second order filter to approximate dynamics of the fan or pump's speed, and to improve numerics" - annotation (Placement(transformation(extent={{20,61},{40,80}}))); - - Modelica.Blocks.Math.Gain gaiSpe(y(final unit="1")) - if inputType == IBPSA.Fluid.Types.InputType.Continuous and - speedIsInput - "Gain to normalized speed using speed_nominal or speed_rpm_nominal" - annotation (Placement(transformation(extent={{-4,74},{-16,86}}))); - - IBPSA.Fluid.Movers.BaseClasses.IdealSource preSou( - redeclare final package Medium = Medium, - final m_flow_small=m_flow_small, - final allowFlowReversal=allowFlowReversal, - final control_m_flow= (preVar == IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.FlowRate)) - "Pressure source" - annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - - IBPSA.Fluid.Movers.BaseClasses.PowerInterface heaDis( - final motorCooledByFluid=per.motorCooledByFluid, - final delta_V_flow=1E-3*V_flow_max) - if addPowerToMedium "Heat dissipation into medium" - annotation (Placement(transformation(extent={{20,-80},{40,-60}}))); - - Modelica.Blocks.Math.Add PToMed(final k1=1, final k2=1) - if addPowerToMedium "Heat and work input into medium" - annotation (Placement(transformation(extent={{50,-90},{70,-70}}))); - - Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow prePow( - final alpha=0) - if addPowerToMedium - "Prescribed power (=heat and flow work) flow for dynamic model" - annotation (Placement(transformation(extent={{-14,-104},{-34,-84}}))); - - Modelica.Blocks.Sources.RealExpression rho_inlet(y= - Medium.density( - Medium.setState_phX(port_a.p, - inStream(port_a.h_outflow), - inStream(port_a.Xi_outflow)))) - "Density of the inflowing fluid" - annotation (Placement(transformation(extent={{-90,-74},{-70,-54}}))); - - IBPSA.Fluid.Sensors.MassFlowRate senMasFlo( - redeclare final package Medium = Medium) "Mass flow rate sensor" - annotation (Placement(transformation(extent={{-50,10},{-30,-10}}))); - - IBPSA.Fluid.Sensors.RelativePressure senRelPre( - redeclare final package Medium = Medium) "Head of mover" - annotation (Placement(transformation(extent={{58,-27},{43,-14}}))); - - // Because the speed data are not used by FlowMachineInterface, we set them - // to zero. - IBPSA.Fluid.Movers.BaseClasses.FlowMachineInterface eff( - per( - final powerOrEfficiencyIsHydraulic = per.powerOrEfficiencyIsHydraulic, - final efficiency = per.efficiency, - final motorEfficiency = per.motorEfficiency, - final motorEfficiency_yMot = per.motorEfficiency_yMot, - final motorCooledByFluid = per.motorCooledByFluid, - final speed_nominal = 0, - final constantSpeed = 0, - final speeds = {0}, - final power = per.power, - final peak = per.peak), - final nOri = nOri, - final rho_default=rho_default, - final computePowerUsingSimilarityLaws=computePowerUsingSimilarityLaws, - r_V(start=_m_flow_nominal/rho_default), - final preVar=preVar) "Flow machine" - annotation (Placement(transformation(extent={{-32,-68},{-12,-48}}))); - -protected - block Extractor - "Extract scalar signal out of signal vector dependent on IntegerRealInput index" - extends Modelica.Blocks.Interfaces.MISO; - - Modelica.Blocks.Interfaces.IntegerInput index "Integer input for control input" - annotation (Placement( - transformation( - origin={0,-120}, - extent={{-20,-20},{20,20}}, - rotation=90))); - equation - y = sum({if index == i then u[i] else 0 for i in 1:nin}); - - annotation (Icon(graphics={ - Rectangle( - extent={{-80,50},{-40,-50}}, - lineColor={0,0,127}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Polygon( - points={{-84.4104,1.9079},{-84.4104,-2.09208},{-80.4104,-0.09208},{ - -84.4104,1.9079}}, - lineColor={0,0,127}, - fillColor={0,0,0}, - fillPattern=FillPattern.Solid), - Line(points={{-62,2},{-50.1395,12.907},{-39.1395,12.907}}, color={0,0, - 127}), - Line(points={{-63,4},{-49,40},{-39,40}}, color={0,0,127}), - Line(points={{-102,0},{-65.0373,-0.01802}}, color={0,0,127}), - Ellipse( - extent={{-70.0437,4.5925},{-60.0437,-4.90745}}, - lineColor={0,0,127}, - fillColor={0,0,127}, - fillPattern=FillPattern.Solid), - Line(points={{-63,-5},{-50,-40},{-39,-40}}, color={0,0,127}), - Line(points={{-62,-2},{-50.0698,-12.907},{-39.0698,-12.907}}, color={ - 0,0,127}), - Polygon( - points={{-38.8808,-11},{-38.8808,-15},{-34.8808,-13},{-38.8808,-11}}, - lineColor={0,0,127}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Polygon( - points={{-39,42},{-39,38},{-35,40},{-39,42}}, - lineColor={0,0,127}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Polygon( - points={{-38.8728,-38.0295},{-38.8728,-42.0295},{-34.8728,-40.0295}, - {-38.8728,-38.0295}}, - lineColor={0,0,127}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Polygon( - points={{-38.9983,14.8801},{-38.9983,10.8801},{-34.9983,12.8801},{-38.9983, - 14.8801}}, - lineColor={0,0,127}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Rectangle( - extent={{-30,50},{30,-50}}, - fillColor={235,235,235}, - fillPattern=FillPattern.Solid, - lineColor={0,0,127}), - Line(points={{100,0},{0,0}}, color={0,0,127}), - Line(points={{0,2},{0,-104}}, color={255,128,0}), - Line(points={{-35,40},{-20,40}}, color={0,0,127}), - Line(points={{-35,13},{-20,13}}, color={0,0,127}), - Line(points={{-35,-13},{-20,-13}}, color={0,0,127}), - Line(points={{-35,-40},{-20,-40}}, color={0,0,127}), - Polygon(points={{0,0},{-20,13},{-20,13},{0,0},{0,0}}, lineColor={0,0, - 127}), - Ellipse( - extent={{-6,6},{6,-6}}, - lineColor={255,128,0}, - fillColor={255,128,0}, - fillPattern=FillPattern.Solid)})); - end Extractor; - -initial algorithm - // The control signal is dp or m_flow but the user did not provide a fan or pump curve. - // Hence, the speed is computed using default values, which likely are wrong. - // Therefore, scaling the power using the speed is inaccurate. - assert(nominalValuesDefineDefaultPressureCurve or - per.havePressureCurve or - (preVar == IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.Speed), -"*** Warning: You are using a flow or pressure controlled mover with the - default pressure curve. - This leads to approximate calculations of the electrical power - consumption. Add the correct pressure curve in the record per - to obtain an accurate computation. - Setting nominalValuesDefineDefaultPressureCurve=true will suppress this warning.", - level=AssertionLevel.warning); - - // The control signal is dp or m_flow but the user did not provide a fan or pump curve. - // Hence, the speed is computed using default values, which likely are wrong. - // In addition, the user wants to use (V_flow, P) to compute the power. - // This can lead to using a power that is less than the flow work. We avoid - // this by ignoring the setting of per.etaHydMet. - // The comment is split into two parts since otherwise the JModelica C-compiler - // throws warnings. - assert(nominalValuesDefineDefaultPressureCurve or - (per.havePressureCurve or - (preVar == IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.Speed)) or - per.etaHydMet<> - IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate, -"*** Warning: You are using a flow or pressure controlled mover with the - default pressure curve with per.etaHydMet set to - IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate. - Since this can cause wrong power consumption, the model will overwrite - this setting and use instead - IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.NotProvided." + - "See the user guide to see what assumptions are made in this setting - or provide other information to the model. - Setting nominalValuesDefineDefaultPressureCurve=true will suppress this warning.", - level=AssertionLevel.warning); - - assert(per.havePressureCurve or - not (per.etaHydMet == - IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate - or per.etaHydMet == - IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber), -"*** Warning in "+ getInstanceName()+ - ": per.etaHydMet is set to .Power_VolumeFlowRate or .EulerNumber. - This requires that per.pressure be provided. - Because it is not, - the model will override this setting and use .NotProvided instead.", - level=AssertionLevel.warning); - - assert(per.havePressureCurve or per.haveWMot_nominal or - not (per.etaMotMet == - IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_MotorPartLoadRatio - or per.etaMotMet == - IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve), -"*** Warning in "+ getInstanceName()+ - ": per.etaMotMet is set to .Efficiency_MotorPartLoadRatio - or .GenericCurve. This requires that per.WMot_nominal be provided - or at least per.pressure be provided so that per.WMot_nominal can - be estimated. Because neither is provided, - the model will override this setting and use .NotProvided instead.", - level=AssertionLevel.warning); - - assert(per.powerOrEfficiencyIsHydraulic or - not (per.etaMotMet == - IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_MotorPartLoadRatio - or per.etaMotMet == - IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve), -"*** Warning in "+ getInstanceName()+ - ": per.etaMotMet is set to .Efficiency_MotorPartLoadRatio - or .GenericCurve while information is provided for total electric - power instead of hydraulic power. This forms an algebraic loop - and may cause the simulation to not converge - (see the \"Motor efficiency\" section in usersguide).", - level=AssertionLevel.warning); - -equation - connect(prePow.port, vol.heatPort) annotation (Line( - points={{-34,-94},{-60,-94},{-60,10},{-70,10}}, - color={191,0,0})); - - connect(vol.heatPort, heatPort) annotation (Line( - points={{-70,10},{-70,10},{-60,10},{-60,-100}}, - color={191,0,0})); - connect(preSou.port_b, port_b) annotation (Line( - points={{60,0},{100,0}}, - color={0,127,255}, - smooth=Smooth.None)); - connect(stageValues.y, extractor.u) annotation (Line( - points={{-59,50},{-52,50}}, - color={0,0,127}, - smooth=Smooth.None)); - connect(extractor.y, inputSwitch.u) annotation (Line( - points={{-29,50},{-22,50}}, - color={0,0,127}, - smooth=Smooth.None)); - connect(setConst.y, inputSwitch.u) annotation (Line( - points={{-59,80},{-26,80},{-26,50},{-22,50}}, - color={0,0,127}, - smooth=Smooth.None)); - connect(extractor.index, stage) annotation (Line( - points={{-40,62},{-40,90},{0,90},{0,120}}, - color={255,127,0}, - smooth=Smooth.None)); - - connect(PToMed.y, prePow.Q_flow) annotation (Line(points={{71,-80},{80,-80},{80, - -94},{-14,-94}}, color={0,0,127})); - connect(PToMed.u1, heaDis.Q_flow) annotation (Line(points={{48,-74},{44,-74},{ - 44,-72},{44,-70},{41,-70}}, - color={0,0,127})); - - connect(senRelPre.port_b, preSou.port_a) annotation (Line(points={{43,-20.5},{ - 20,-20.5},{20,0},{40,0}}, - color={0,127,255})); - connect(senRelPre.port_a, preSou.port_b) annotation (Line(points={{58,-20.5},{ - 80,-20.5},{80,0},{60,0}}, - color={0,127,255})); - connect(heaDis.V_flow,eff. V_flow) annotation (Line(points={{18,-60},{14,-60}, - {14,-52},{-11,-52}}, color={0,0,127})); - connect(eff.PEle, heaDis.PEle) annotation (Line(points={{-11,-60},{0,-60},{0, - -80},{18,-80}}, color={0,0,127})); - connect(eff.WFlo, heaDis.WFlo) annotation (Line(points={{-11,-56},{4,-56},{4, - -66},{18,-66}}, color={0,0,127})); - connect(rho_inlet.y,eff. rho) annotation (Line(points={{-69,-64},{-69,-64},{-34, - -64}}, color={0,0,127})); - connect(eff.m_flow, senMasFlo.m_flow) annotation (Line(points={{-34,-54},{-34, - -54},{-40,-54},{-40,-11}}, color={0,0,127})); - connect(eff.WFlo, PToMed.u2) annotation (Line(points={{-11,-56},{4,-56},{4, - -86},{48,-86}}, color={0,0,127})); - connect(inputSwitch.y, filter.u) annotation (Line(points={{1,50},{12,50},{12,70.5}, - {18,70.5}}, color={0,0,127})); - - connect(senRelPre.p_rel, eff.dp_in) annotation (Line(points={{50.5,-26.35},{50.5, - -38},{-18,-38},{-18,-46}}, color={0,0,127})); - connect(eff.y_out, y_actual) annotation (Line(points={{-11,-48},{92,-48},{92, - 70},{110,70}}, - color={0,0,127})); - connect(port_a, vol.ports[1]) - annotation (Line(points={{-100,0},{-79,0},{-79,0}}, color={0,127,255})); - connect(vol.ports[2], senMasFlo.port_a) - annotation (Line(points={{-81,0},{-81,0},{-50,0}}, color={0,127,255})); - connect(senMasFlo.port_b, preSou.port_a) - annotation (Line(points={{-30,0},{40,0},{40,0}}, color={0,127,255})); - connect(eff.WHyd, heaDis.WHyd) annotation (Line(points={{-11,-58},{2,-58},{2, - -74},{18,-74}}, color={0,0,127})); - connect(eff.PEle, P) annotation (Line(points={{-11,-60},{0,-60},{0,-50},{90, - -50},{90,90},{110,90}}, - color={0,0,127})); - annotation(Icon(coordinateSystem(preserveAspectRatio=false, - extent={{-100,-100},{100,100}}), - graphics={ - Line( - points={{0,70},{100,70}}, - color={0,0,0}, - smooth=Smooth.None), - Line( - points={{0,90},{100,90}}, - color={0,0,0}, - smooth=Smooth.None), - Line( - visible=not use_inputFilter, - points={{0,100},{0,40}}), - Rectangle( - extent={{-100,16},{100,-16}}, - lineColor={0,0,0}, - fillColor={0,127,255}, - fillPattern=FillPattern.HorizontalCylinder), - Ellipse( - extent={{-58,58},{58,-58}}, - lineColor={0,0,0}, - fillPattern=FillPattern.Sphere, - fillColor={0,100,199}), - Polygon( - points={{0,50},{0,-50},{54,0},{0,50}}, - lineColor={0,0,0}, - pattern=LinePattern.None, - fillPattern=FillPattern.HorizontalCylinder, - fillColor={255,255,255}), - Ellipse( - extent={{4,16},{36,-16}}, - lineColor={0,0,0}, - fillPattern=FillPattern.Sphere, - visible=energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState, - fillColor={0,100,199}), - Text(extent={{64,106},{114,92}}, - textColor={0,0,127}, - textString="P"), - Text(extent={{42,86},{92,72}}, - textColor={0,0,127}, - textString="y_actual"), - Line( - points={{0,100},{0,50}}, - color={0,0,0}, - smooth=Smooth.None), - Rectangle( - visible=use_inputFilter, - extent={{-32,40},{34,100}}, - lineColor={0,0,0}, - fillColor={135,135,135}, - fillPattern=FillPattern.Solid), - Ellipse( - visible=use_inputFilter, - extent={{-32,100},{34,40}}, - lineColor={0,0,0}, - fillColor={135,135,135}, - fillPattern=FillPattern.Solid), - Text( - visible=use_inputFilter, - extent={{-20,92},{22,46}}, - textColor={0,0,0}, - fillColor={135,135,135}, - fillPattern=FillPattern.Solid, - textString="M", - textStyle={TextStyle.Bold})}), - obsolete = "Obsolete model - use IBPSA.Fluid.Movers.BaseClasses.PartialFlowMachine instead", -Documentation(info=" -

-This is the base model for fans and pumps. -It provides an interface -between the equations that compute head and power consumption, -and the implementation of the energy and pressure balance -of the fluid. -

-

-Optionally, the fluid volume -is computed using a dynamic balance or a steady-state balance. -

-

-The parameter addPowerToMedium determines whether -any power is added to the fluid. The default is addPowerToMedium=true, -and hence the outlet enthalpy is higher than the inlet enthalpy if the -flow device is operating. -The setting addPowerToMedium=false is physically incorrect -(since the flow work, the flow friction and the fan heat do not increase -the enthalpy of the medium), but this setting does in some cases lead to simpler equations -and more robust simulation, in particular if the mass flow is equal to zero. -

-

-In the previous implementation, this model extends from - -IBPSA.Fluid.Interfaces.PartialTwoPortInterface. -Now it copies much of the code instead. -This is to resolve a potential circular parameter binding that occurs when - -IBPSA.Fluid.Movers.Preconfigured.SpeedControlled_y -extends from - -IBPSA.Fluid.Movers.SpeedControlled_y. -The former uses the nominal flow rate provided by user to construct -the pressure curve, whilst the latter uses the user-provided pressure curve -to determine the nominal flow rate. The new implementation removes the -original declaration of nominal flow rate from - -IBPSA.Fluid.Interfaces.PartialTwoPortInterface -and hides it (protected _m_flow_nominal) from the user. -This way, A higher-level model (e.g. - -IBPSA.Fluid.Movers.FlowControlled_dp), -can still provide a default but not the other way around. -See discussions in -#1705. -

-", -revisions=" - -")); -end PartialFlowMachine; diff --git a/IBPSA/Obsolete/Fluid/Movers/BaseClasses/package.mo b/IBPSA/Obsolete/Fluid/Movers/BaseClasses/package.mo deleted file mode 100644 index 20dfc0e4f9..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/BaseClasses/package.mo +++ /dev/null @@ -1,11 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers; -package BaseClasses "Package with base classes for IBPSA.Obsolete.Fluid.Movers" - extends Modelica.Icons.BasesPackage; -annotation (preferredView="info", Documentation(info=" -

-This package contains base classes that are used to construct the models in - -IBPSA.Obsolete.Fluid.Movers. -

-")); -end BaseClasses; diff --git a/IBPSA/Obsolete/Fluid/Movers/BaseClasses/package.order b/IBPSA/Obsolete/Fluid/Movers/BaseClasses/package.order deleted file mode 100644 index 1de5c0a7f0..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/BaseClasses/package.order +++ /dev/null @@ -1 +0,0 @@ -PartialFlowMachine diff --git a/IBPSA/Obsolete/Fluid/Movers/Data/Generic.mo b/IBPSA/Obsolete/Fluid/Movers/Data/Generic.mo deleted file mode 100644 index 71ba99f159..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Data/Generic.mo +++ /dev/null @@ -1,300 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers.Data; -record Generic "Generic data record for movers" - extends Modelica.Icons.Record; - - // Pressure requires default values to avoid in Dymola the message - // Failed to expand the variable pressure.V_flow. - parameter IBPSA.Fluid.Movers.BaseClasses.Characteristics.flowParameters pressure( - V_flow = {0, 0}, - dp = {0, 0}) "Volume flow rate vs. total pressure rise" - annotation(Evaluate=true, - Dialog(group="Pressure curve")); - parameter Modelica.Units.SI.VolumeFlowRate V_flow_max= - if havePressureCurve - then (pressure.V_flow[end] - -(pressure.V_flow[end] - pressure.V_flow[end - 1]) - /(pressure.dp[end] - pressure.dp[end - 1]) - * pressure.dp[end]) - else 0 - "Volume flow rate on the curve when pressure rise is zero"; - parameter Modelica.Units.SI.PressureDifference dpMax(displayUnit="Pa")= - if havePressureCurve - then (pressure.dp[1] - -(pressure.dp[1] - pressure.dp[2]) - /(pressure.V_flow[1] - pressure.V_flow[2]) - * pressure.V_flow[1]) - else 0 - "Pressure rise on the curve when flow rate is zero"; - - // Efficiency computation choices - parameter IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod etaHydMet= - IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber - "Efficiency computation method for the hydraulic efficiency etaHyd" - annotation (Dialog(group="Power computation")); - parameter IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod etaMotMet= - if powerOrEfficiencyIsHydraulic - then IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve - else IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.NotProvided - "Efficiency computation method for the motor efficiency etaMot" - annotation (Dialog(group="Power computation")); - - parameter Boolean powerOrEfficiencyIsHydraulic=true - "=true if hydraulic power or efficiency is provided, instead of total" - annotation (Dialog(group="Power computation", - enable=max(power.P)>Modelica.Constants.eps - or max(efficiency.eta)>Modelica.Constants.eps)); - - // Arrays for efficiency values - parameter - IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters - efficiency( - V_flow={0}, - eta={0.7}) "Total or hydraulic efficiency vs. volumetric flow rate" - annotation (Dialog(group="Power computation", - enable=etaHydMet == IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Efficiency_VolumeFlowRate)); - parameter - IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters - motorEfficiency( - V_flow={0}, - eta={0.7}) - "Motor efficiency vs. volumetric flow rate" - annotation (Dialog(group="Power computation", - enable=etaMotMet == IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_VolumeFlowRate)); - parameter - IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot - motorEfficiency_yMot(y={0}, eta={0.7}) - "Motor efficiency vs. part load ratio yMot, where yMot = WHyd/WMot_nominal" - annotation (Dialog(group="Power computation", enable=etaMotMet == - IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_MotorPartLoadRatio)); - - // Power curve - // It requires default values to suppress Dymola message - // "Failed to expand the variable Power.V_flow" - parameter IBPSA.Fluid.Movers.BaseClasses.Characteristics.powerParameters power( - V_flow={0}, - P={0}) - "Power (either consumed or hydraulic) vs. volumetric flow rate" - annotation (Dialog(group="Power computation", - enable = etaHydMet== - IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate)); - - // Peak condition - parameter IBPSA.Fluid.Movers.BaseClasses.Euler.peak peak( - V_flow=peak_internal.V_flow, - dp=peak_internal.dp, - eta=peak_internal.eta) - "Volume flow rate, pressure rise, and efficiency (either total or hydraulic) at peak condition" - annotation (Dialog(group="Power computation", - enable = etaHydMet== - IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber)); - final parameter IBPSA.Fluid.Movers.BaseClasses.Euler.peak peak_internal= - IBPSA.Fluid.Movers.BaseClasses.Euler.getPeak(pressure=pressure,power=power) - "Internal peak variable"; - // The getPeak() function automatically handles the estimation of peak point - // when insufficient information is provided from the pressure curve. - - // Motor - parameter Boolean motorCooledByFluid=true - "If true, then motor heat is added to fluid stream" - annotation(Dialog(group="Motor heat rejection")); - parameter Modelica.Units.SI.Power WMot_nominal= - if max(power.P)>Modelica.Constants.eps - then - if powerOrEfficiencyIsHydraulic - then max(power.P)*1.2 - else max(power.P) - else - if havePressureCurve - then V_flow_max/2 * dpMax/2 /0.7*1.2 - else 0 - "Rated motor power" - annotation(Dialog(group="Power computation", - enable= etaMotMet== - IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_MotorPartLoadRatio - or etaMotMet== - IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve)); - parameter Modelica.Units.SI.Efficiency etaMot_max(max=1)= 0.7 - "Maximum motor efficiency" - annotation (Dialog(group="Power computation", enable=etaMotMet == - IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve)); - final parameter - IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot - motorEfficiency_yMot_generic= - IBPSA.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve( - P_nominal=WMot_nominal, - eta_max=etaMot_max) - "Motor efficiency vs. part load ratio" - annotation (Dialog(enable=false)); - final parameter Boolean haveWMot_nominal=WMot_nominal > Modelica.Constants.eps - "= true, if the rated motor power is provided"; - - // Speed - parameter Real speed_nominal( - final min=0, - final unit="1") = 1 "Nominal rotational speed for flow characteristic" - annotation (Dialog(group="Normalized speeds (used in model, default values assigned from speeds in rpm)")); - - parameter Real constantSpeed(final min=0, final unit="1") = constantSpeed_rpm/speed_rpm_nominal - "Normalized speed set point, used if inputType = IBPSA.Fluid.Types.InputType.Constant" - annotation (Dialog(group="Normalized speeds (used in model, default values assigned from speeds in rpm)")); - - parameter Real[:] speeds(each final min = 0, each final unit="1") = speeds_rpm/speed_rpm_nominal - "Vector of normalized speed set points, used if inputType = IBPSA.Fluid.Types.InputType.Stages" - annotation (Dialog(group="Normalized speeds (used in model, default values assigned from speeds in rpm)")); - - parameter Modelica.Units.NonSI.AngularVelocity_rpm speed_rpm_nominal=1500 - "Nominal rotational speed for flow characteristic" - annotation (Dialog(group="Speeds in RPM")); - - parameter Modelica.Units.NonSI.AngularVelocity_rpm constantSpeed_rpm= - speed_rpm_nominal - "Speed set point, used if inputType = IBPSA.Fluid.Types.InputType.Constant" - annotation (Dialog(group="Speeds in RPM")); - - parameter Modelica.Units.NonSI.AngularVelocity_rpm[:] speeds_rpm={ - speed_rpm_nominal} - "Vector of speed set points, used if inputType = IBPSA.Fluid.Types.InputType.Stages" - annotation (Dialog(group="Speeds in RPM")); - - // Set a parameter in order for - // (a) FlowControlled_m_flow and FlowControlled_dp to be able to set a reasonable - // default pressure curve if it is not specified here, and - // (b) SpeedControlled_y to be able to issue an assert - // if no pressure curve is specified. - final parameter Boolean havePressureCurve= - sum(pressure.V_flow) > Modelica.Constants.eps and - sum(pressure.dp) > Modelica.Constants.eps - "= true, if default record values are being used"; - - annotation ( - defaultComponentPrefixes = "parameter", - defaultComponentName = "per", - Documentation(revisions=" - -", info=" -

-Record containing parameters for pumps or fans. -

-

Typical use

-

-This record may be used to assign for example fan performance data using -declaration such as -

-
-  IBPSA.Fluid.Movers.SpeedControlled_y fan(
-    redeclare package Medium = Medium,
-      per(pressure(V_flow={0,m_flow_nominal,2*m_flow_nominal}/1.2,
-                   dp={2*dp_nominal,dp_nominal,0}))) \"Fan\";
-
-

-This data record can be used with - -IBPSA.Fluid.Movers.SpeedControlled_y, - -IBPSA.Fluid.Movers.FlowControlled_dp, - -IBPSA.Fluid.Movers.FlowControlled_m_flow. -

-

-An example that uses manufacturer data can be found in - -IBPSA.Fluid.Movers.Validation.Pump_y_stratos. -

-

Declaration of the peak condition

-

-The variable peak is intentionally declared in a way that each of its -element is declared individually. If it was delcared the same way as does -peak_internal, Modelica would prevent the modification of its -specific elements with the following error message:
- -Record has a value, and attempt to modify specific elements.
-The element modification of e.g. V_flow will be ignored.
- -The other variable peak_internal uses a function call to compute its -default values. By passing them to peak one by one, the model can -both have default values and also allow the user to override them easily. -See -Modelica Specification issue #791. -

-

Parameters in RPM

-

-The parameters speed_rpm_nominal, -constantSpeed_rpm and -speeds_rpm are used to assign the non-dimensional speeds -

-
-  parameter Real constantSpeed(final min=0, final unit=\"1\") = constantSpeed_rpm/speed_rpm_nominal;
-  parameter Real[:] speeds(each final min = 0, each final unit=\"1\") = speeds_rpm/speed_rpm_nominal;
-
-

-Flow-controlled models do not these speed parameters in RPM. -

-")); -end Generic; diff --git a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/Stratos25slash1to4.mo b/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/Stratos25slash1to4.mo deleted file mode 100644 index aaba3f0d52..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/Stratos25slash1to4.mo +++ /dev/null @@ -1,69 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers.Data.Pumps.Wilo; -record Stratos25slash1to4 "Pump data for a Wilo Stratos 25/1-4 pump" - extends Generic( - speed_rpm_nominal=1800, - final powerOrEfficiencyIsHydraulic=false, - etaHydMet=IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate, - power(V_flow={5.55555555556e-07, 0.000402190923318, 0.00052269170579, - 0.000643192488263, 0.000752738654147, 0.000866979655712, - 0.000973395931142, 0.00108607198748, 0.00115962441315}, - P={ 14.2085618951, 21.2596204596, 23.3573239437, - 25.1349149442, 26.581943662, 27.9121571534, - 28.8498841148, 29.4981726255, 29.7520982304}), - pressure(V_flow={5.55555555556e-07, 0.000402190923318, 0.00052269170579, - 0.000643192488263, 0.000752738654147, 0.000866979655712, - 0.000973395931142, 0.00108607198748, 0.00115962441315}, - dp={ 17066.9518717, 16997.0053476, 16437.4331551, - 15528.1283422, 14408.9839572, 13149.9465241, - 11681.0695187, 9932.40641711, 8533.47593583})); - annotation ( -defaultComponentPrefixes="parameter", -defaultComponentName="per", -Documentation(info=" -

Data from: - - http://productfinder.wilo.com/en/COM/product/0000000e000379df0002003a/fc_product_datasheet - -

-

See - - IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6 - - for more information about how the data is derived. -

- ", - revisions=" - -")); -end Stratos25slash1to4; diff --git a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/Stratos32slash1to12.mo b/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/Stratos32slash1to12.mo deleted file mode 100644 index 10e5ade309..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/Stratos32slash1to12.mo +++ /dev/null @@ -1,68 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers.Data.Pumps.Wilo; -record Stratos32slash1to12 "Pump data for a Wilo Stratos 32/1-12 pump" - extends Generic( - speed_rpm_nominal=3580, - final powerOrEfficiencyIsHydraulic=false, - etaHydMet=IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate, - power(V_flow={2.11830535572e-05, 0.000167865707434, 0.000700939248601, - 0.0012450039968, 0.00177258193445, 0.00227268185452, - 0.00272332134293, 0.00312450039968, 0.00345423661071}, - P={ 103.427852653, 110.225580543, 135.414121033, - 162.955749719, 191.043411366, 216.051565678, - 230.204882307, 236.346847436, 239.552825212}), - pressure(V_flow={2.11830535572e-05, 0.000167865707434, 0.000700939248601, - 0.0012450039968, 0.00177258193445, 0.00227268185452, - 0.00272332134293, 0.00312450039968, 0.00345423661071}, - dp={ 59279.4925671, 59115.2927989, 59000.1476354, - 57351.238791, 54446.2693068, 50284.7374612, - 44865.6398104, 38328.4550274, 32066.9663984})); - annotation ( -defaultComponentPrefixes="parameter", -defaultComponentName="per", -Documentation(info=" -

Data from: - - http://productfinder.wilo.com/en/COM/product/0000000e000379df0002003a/fc_product_datasheet - -

-

See - - IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6 - - for more information about how the data is derived. -

- ", revisions=" - -")); -end Stratos32slash1to12; diff --git a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/package.mo b/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/package.mo deleted file mode 100644 index 338fceee44..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/package.mo +++ /dev/null @@ -1,10 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers.Data.Pumps; -package Wilo "Package with performance data for Wilo pumps" - extends Modelica.Icons.Package; - -annotation (preferredView="info", Documentation(info=" -

-This package contains performance data for Wilo pumps. -

-")); -end Wilo; diff --git a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/package.order b/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/package.order deleted file mode 100644 index eebe7fed12..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/package.order +++ /dev/null @@ -1,2 +0,0 @@ -Stratos25slash1to4 -Stratos32slash1to12 diff --git a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/package.mo b/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/package.mo deleted file mode 100644 index 39a4c1c74e..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/package.mo +++ /dev/null @@ -1,15 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers.Data; -package Pumps "Package containing data for pumps" - extends Modelica.Icons.Package; - -annotation (preferredView="info", Documentation(info=" -

-This package contains data for pumps. -

-

-See the - -User's Guide for more information. -

-")); -end Pumps; diff --git a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/package.order b/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/package.order deleted file mode 100644 index 08113d759f..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/package.order +++ /dev/null @@ -1 +0,0 @@ -Wilo diff --git a/IBPSA/Obsolete/Fluid/Movers/Data/package.mo b/IBPSA/Obsolete/Fluid/Movers/Data/package.mo deleted file mode 100644 index 0c62b262fc..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Data/package.mo +++ /dev/null @@ -1,15 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers; -package Data "Package containing data for real pumps/fans" -extends Modelica.Icons.MaterialPropertiesPackage; - -annotation (preferredView="info", Documentation(info=" -

-This package contains data for fans and pumps. -

-

-See the - -User's Guide for more information. -

-")); -end Data; diff --git a/IBPSA/Obsolete/Fluid/Movers/Data/package.order b/IBPSA/Obsolete/Fluid/Movers/Data/package.order deleted file mode 100644 index 7bbde5448e..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Data/package.order +++ /dev/null @@ -1,2 +0,0 @@ -Generic -Pumps diff --git a/IBPSA/Obsolete/Fluid/Movers/Examples/MoverContinuous.mo b/IBPSA/Obsolete/Fluid/Movers/Examples/MoverContinuous.mo deleted file mode 100644 index 153c94c3b1..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Examples/MoverContinuous.mo +++ /dev/null @@ -1,58 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers.Examples; -model MoverContinuous - "Example model of movers using a real input for setting the stage" - extends IBPSA.Obsolete.Fluid.Movers.Examples.MoverParameter( - pump_Nrpm(inputType=IBPSA.Fluid.Types.InputType.Continuous), - pump_m_flow(inputType=IBPSA.Fluid.Types.InputType.Continuous), - pump_y(inputType=IBPSA.Fluid.Types.InputType.Continuous), - pump_dp(inputType=IBPSA.Fluid.Types.InputType.Continuous)); - Modelica.Blocks.Sources.Ramp ramp(duration=1) "Ramp input for all movers" - annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); - Modelica.Blocks.Math.Gain gaiNrpm(k=2000) "Nominal rpm" - annotation (Placement(transformation(extent={{-40,60},{-20,80}}))); - Modelica.Blocks.Math.Gain gai_m_flow(k=m_flow_nominal) - "Nominal mass flow rate" - annotation (Placement(transformation(extent={{-40,10},{-20,30}}))); - Modelica.Blocks.Math.Gain gai_dp(k=dp_nominal) "Nominal pressure drop" - annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); -equation - connect(gaiNrpm.y, pump_Nrpm.Nrpm) - annotation (Line(points={{-19,70},{0,70},{0,52}}, color={0,0,127})); - connect(gai_dp.y, pump_dp.dp_in) annotation (Line(points={{-19,-60},{-10,-60}, - {0,-60},{0,-68}}, color={0,0,127})); - connect(gai_m_flow.y, pump_m_flow.m_flow_in) - annotation (Line(points={{-19,20},{0,20},{0,12}}, color={0,0,127})); - connect(gaiNrpm.u, ramp.y) - annotation (Line(points={{-42,70},{-59,70}}, color={0,0,127})); - connect(gai_m_flow.u, ramp.y) annotation (Line(points={{-42,20},{-50,20},{-50, - 70},{-59,70}}, color={0,0,127})); - connect(gai_dp.u, ramp.y) annotation (Line(points={{-42,-60},{-50,-60},{-50, - 70},{-59,70}}, color={0,0,127})); - connect(pump_y.y, ramp.y) annotation (Line(points={{0,-28},{0,-20},{-50,-20},{ - -50,70},{-59,70}}, color={0,0,127})); - annotation ( - Documentation(info=" -

-This example demonstrates the use of a RealInput -connector for a mover model. -

-", revisions=" - -"), -experiment(Tolerance=1e-06, StopTime=1), -__Dymola_Commands(file= - "modelica://IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverContinuous.mos" - "Simulate and plot")); -end MoverContinuous; diff --git a/IBPSA/Obsolete/Fluid/Movers/Examples/MoverParameter.mo b/IBPSA/Obsolete/Fluid/Movers/Examples/MoverParameter.mo deleted file mode 100644 index 0a6be9225d..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Examples/MoverParameter.mo +++ /dev/null @@ -1,126 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers.Examples; -model MoverParameter - "Example model of movers using a parameter for setting the stage" - extends Modelica.Icons.Example; - package Medium = IBPSA.Media.Water; - - parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=2 - "Nominal mass flow rate"; - - IBPSA.Fluid.Movers.FlowControlled_m_flow pump_m_flow( - redeclare package Medium = Medium, - m_flow_nominal=m_flow_nominal, - use_inputFilter=false, - massFlowRates={0,0.5,1}*m_flow_nominal, - inputType=IBPSA.Fluid.Types.InputType.Constant, - energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState) - "Pump with m_flow input" - annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); - - IBPSA.Fluid.Sources.Boundary_pT sou( - redeclare package Medium = Medium, - nPorts=4) "Fluid source" - annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); - - IBPSA.Fluid.Sources.Boundary_pT sin(redeclare package Medium = Medium, - nPorts=4) "Fluid sink" - annotation (Placement(transformation(extent={{80,-10},{60,10}}))); - IBPSA.Fluid.Movers.SpeedControlled_y pump_y( - redeclare package Medium = Medium, - redeclare IBPSA.Obsolete.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to4 per( - speeds_rpm=1800*{0,0.5,1}, constantSpeed_rpm=1800), - use_inputFilter=false, - inputType=IBPSA.Fluid.Types.InputType.Constant, - energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState) - "Pump with normalised speed input" - annotation (Placement(transformation(extent={{-10,-50},{10,-30}}))); - IBPSA.Fluid.Movers.FlowControlled_dp pump_dp( - redeclare package Medium = Medium, - m_flow_nominal=m_flow_nominal, - redeclare IBPSA.Obsolete.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to4 per, - use_inputFilter=false, - heads={0,0.5,1}*dp_nominal, - inputType=IBPSA.Fluid.Types.InputType.Constant, - dp_nominal=dp_nominal, - energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState) - "Pump with pressure head input" - annotation (Placement(transformation(extent={{-10,-90},{10,-70}}))); - IBPSA.Fluid.FixedResistances.PressureDrop res( - redeclare package Medium = Medium, - m_flow_nominal=m_flow_nominal, - dp_nominal=dp_nominal) - "Pressure drop component for avoiding singular system" - annotation (Placement(transformation(extent={{26,-90},{46,-70}}))); - IBPSA.Obsolete.Fluid.Movers.SpeedControlled_Nrpm pump_Nrpm( - redeclare package Medium = Medium, - use_inputFilter=false, - redeclare IBPSA.Obsolete.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to4 per( - speeds_rpm={0,1000,2000}, constantSpeed_rpm=2000), - inputType=IBPSA.Fluid.Types.InputType.Constant, - energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState) - "Pump with speed input" - annotation (Placement(transformation(extent={{-10,30},{10,50}}))); - parameter Modelica.Units.SI.PressureDifference dp_nominal=10000 - "Nominal pressure raise"; -equation - connect(sou.ports[1], pump_m_flow.port_a) annotation (Line( - points={{-60,-1.5},{-60,0},{-10,0}}, - color={0,127,255}, - smooth=Smooth.None)); - connect(pump_m_flow.port_b, sin.ports[1]) annotation (Line( - points={{10,0},{60,0},{60,-1.5}}, - color={0,127,255}, - smooth=Smooth.None)); - connect(res.port_a, pump_dp.port_b) - annotation (Line(points={{26,-80},{18,-80},{10,-80}}, color={0,127,255})); - connect(pump_y.port_b, sin.ports[2]) - annotation (Line(points={{10,-40},{60,-40},{60,-0.5}}, - color={0,127,255})); - connect(res.port_b, sin.ports[3]) - annotation (Line(points={{46,-80},{60,-80},{60,0.5}},color={0,127,255})); - connect(pump_dp.port_a, sou.ports[2]) - annotation (Line(points={{-10,-80},{-60,-80},{-60,-0.5}}, - color={0,127,255})); - connect(pump_y.port_a, sou.ports[3]) annotation (Line(points={{-10,-40},{-20,-40}, - {-60,-40},{-60,0.5}},color={0,127,255})); - connect(sou.ports[4], pump_Nrpm.port_a) annotation (Line(points={{-60,1.5},{-60, - 1.5},{-60,34},{-60,40},{-10,40}},color={0,127,255})); - connect(pump_Nrpm.port_b, sin.ports[4]) annotation (Line(points={{10,40},{24,40}, - {60,40},{60,1.5}},color={0,127,255})); - annotation ( - __Dymola_Commands(file= - "modelica://IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverParameter.mos" - "Simulate and plot"), - Documentation(info=" -

-This example demonstrates the use of a Parameter -set point for a mover model. -

-", revisions=" - -"), - experiment(Tolerance=1e-06, StopTime=1)); -end MoverParameter; diff --git a/IBPSA/Obsolete/Fluid/Movers/Examples/MoverStages.mo b/IBPSA/Obsolete/Fluid/Movers/Examples/MoverStages.mo deleted file mode 100644 index 2c4d3bdb34..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Examples/MoverStages.mo +++ /dev/null @@ -1,68 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers.Examples; -model MoverStages - "Example model of movers using an integer input for setting the stage" - extends IBPSA.Obsolete.Fluid.Movers.Examples.MoverParameter( - pump_Nrpm(inputType=IBPSA.Fluid.Types.InputType.Stages), - pump_m_flow(inputType=IBPSA.Fluid.Types.InputType.Stages), - pump_y(inputType=IBPSA.Fluid.Types.InputType.Stages), - pump_dp(inputType=IBPSA.Fluid.Types.InputType.Stages)); - package Medium = IBPSA.Media.Water; - - parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=2 - "Nominal mass flow rate"; - - Modelica.Blocks.Sources.IntegerTable integerTable(table=[0,1; 0.3,2; 0.6,3]) - "Integer step input, 1 is off, 2 is on" - annotation (Placement(transformation(extent={{-60,70},{-40,90}}))); - parameter Modelica.Units.SI.PressureDifference dp_nominal=10000 - "Nominal pressure raise"; -equation - connect(integerTable.y, pump_Nrpm.stage) - annotation (Line(points={{-39,80},{0,80},{0,52}}, color={255,127,0})); - connect(integerTable.y, pump_m_flow.stage) - annotation (Line(points={{-39,80},{-30,80},{-30,20},{-30,20},{-30,20},{0,20}, - {0,12}}, color={255,127,0})); - connect(integerTable.y, pump_y.stage) - annotation (Line(points={{-39,80},{-30,80},{-30,-16},{-30,-16},{-30,-20},{0, - -20},{0,-28}}, color={255,127,0})); - connect(integerTable.y, pump_dp.stage) - annotation (Line(points={{-39,80},{-30,80},{-30,-60},{0,-60},{0,-68}}, - color={255,127,0})); - annotation ( - __Dymola_Commands(file= - "modelica://IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverStages.mos" - "Simulate and plot"), - Documentation(info=" -

-This example demonstrates the use of the Integer -stage connector for a mover model. -Note that integer input 1 refers to the first stage, whereas -input 0 switches the mover off. -

-", revisions=" - -"), - experiment(Tolerance=1e-06, StopTime=1)); -end MoverStages; diff --git a/IBPSA/Obsolete/Fluid/Movers/Examples/package.mo b/IBPSA/Obsolete/Fluid/Movers/Examples/package.mo deleted file mode 100644 index d3218583a4..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Examples/package.mo +++ /dev/null @@ -1,9 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers; -package Examples "Obsolete example models" - extends Modelica.Icons.ExamplesPackage; -annotation (preferredView="info", Documentation(info=" -

-This package contains obsolete example models. -

-")); -end Examples; diff --git a/IBPSA/Obsolete/Fluid/Movers/Examples/package.order b/IBPSA/Obsolete/Fluid/Movers/Examples/package.order deleted file mode 100644 index c004b45a2e..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Examples/package.order +++ /dev/null @@ -1,3 +0,0 @@ -MoverContinuous -MoverParameter -MoverStages diff --git a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/SpeedControlled_Nrpm.mo b/IBPSA/Obsolete/Fluid/Movers/Preconfigured/SpeedControlled_Nrpm.mo deleted file mode 100644 index c187a91953..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/SpeedControlled_Nrpm.mo +++ /dev/null @@ -1,61 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers.Preconfigured; -model SpeedControlled_Nrpm "Fan or pump with ideally controlled speed Nrpm as input signal and pre-configured parameters" - extends IBPSA.Obsolete.Fluid.Movers.SpeedControlled_Nrpm( - final per( - pressure( - V_flow=m_flow_nominal/rho_default*{0, 1, 2}, - dp=if rho_default < 500 - then dp_nominal*{1.12, 1, 0} - else dp_nominal*{1.14, 1, 0.42}), - powerOrEfficiencyIsHydraulic=true, - etaHydMet=IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber, - etaMotMet=IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve, - speed_rpm_nominal=speed_rpm_nominal), - final inputType=IBPSA.Fluid.Types.InputType.Continuous, - final init=Modelica.Blocks.Types.Init.InitialOutput, - energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial); - - parameter Modelica.Units.SI.MassFlowRate m_flow_nominal( - final min=Modelica.Constants.small) - "Nominal mass flow rate for configuration of pressure head vs flow rate performance curve" - annotation (Dialog(group="Nominal condition")); - parameter Modelica.Units.SI.PressureDifference dp_nominal( - final min=Modelica.Constants.small) - "Nominal pressure head for configuration of pressure head vs flow rate performance curve" - annotation(Dialog(group="Nominal condition")); - parameter Modelica.Units.NonSI.AngularVelocity_rpm speed_rpm_nominal( - final min=Modelica.Constants.small) - "Nominal rotational speed for configuration of pressure head vs flow rate performance curve" - annotation (Dialog(group="Nominal condition")); - -annotation ( -defaultComponentName="mov", -obsolete = "Obsolete model - use IBPSA.Fluid.Movers.Preconfigured.SpeedControlled_y instead", -Documentation(info=" -

-This model is the preconfigured version for - -IBPSA.Obsolete.Fluid.Movers.SpeedControlled_Nrpm. -", revisions=" -

-")); -end SpeedControlled_Nrpm; diff --git a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/ControlledFlowMachinePreconfigured.mo b/IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/ControlledFlowMachinePreconfigured.mo deleted file mode 100644 index 2d346d011d..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/ControlledFlowMachinePreconfigured.mo +++ /dev/null @@ -1,63 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers.Preconfigured.Validation; -model ControlledFlowMachinePreconfigured - "Preconfigured fans with different control signals" - extends Modelica.Icons.Example; - extends - IBPSA.Obsolete.Fluid.Movers.Validation.BaseClasses.ControlledFlowMachine( - redeclare IBPSA.Fluid.Movers.Preconfigured.SpeedControlled_y fan1( - redeclare package Medium = Medium, - m_flow_nominal=m_flow_nominal, - dp_nominal=dp_nominal), - redeclare IBPSA.Fluid.Movers.Preconfigured.FlowControlled_m_flow fan2( - redeclare package Medium = Medium, - m_flow_nominal=m_flow_nominal, - dp_nominal=dp_nominal), - redeclare IBPSA.Fluid.Movers.Preconfigured.FlowControlled_dp fan3( - redeclare package Medium = Medium, - m_flow_nominal=m_flow_nominal, - dp_nominal=dp_nominal), - redeclare IBPSA.Obsolete.Fluid.Movers.Preconfigured.SpeedControlled_Nrpm fan4( - redeclare package Medium = Medium, - m_flow_nominal=m_flow_nominal, - dp_nominal=dp_nominal, - speed_rpm_nominal=3580), - dp1(m_flow_nominal=m_flow_nominal, dp_nominal=dp_nominal), - dp4(m_flow_nominal=m_flow_nominal, dp_nominal=dp_nominal), - dp2(m_flow_nominal=m_flow_nominal, dp_nominal=dp_nominal), - dp3(m_flow_nominal=m_flow_nominal, dp_nominal=dp_nominal)); - - parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=2 - "Nominal mass flow rate for each fan"; - parameter Modelica.Units.SI.PressureDifference dp_nominal=500 - "Nominal pressure head for each fan"; - - annotation ( -experiment(Tolerance=1e-6, StopTime=600), -__Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Preconfigured/Validation/ControlledFlowMachinePreconfigured.mos" - "Simulate and plot"), - Documentation(info=" -

-This model validates the preconfigured mover models. -It is based on - -IBPSA.Obsolete.Fluid.Movers.Validation.ControlledFlowMachineDynamic. -

-", revisions=" - -"), - Diagram(coordinateSystem(extent={{-160,-80},{160,160}})), - Icon(coordinateSystem(extent={{-100,-100},{100,100}}))); -end ControlledFlowMachinePreconfigured; diff --git a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/package.mo b/IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/package.mo deleted file mode 100644 index fedc7c9296..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/package.mo +++ /dev/null @@ -1,20 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers.Preconfigured; -package Validation "Collection of validation models" - extends Modelica.Icons.ExamplesPackage; - -annotation (preferredView="info", Documentation(info=" -

-This package contains validation models for the classes in - -IBPSA.Obsolete.Fluid.Movers.Preconfigured. -

-

-Note that most validation models contain simple input data -which may not be realistic, but for which the correct -output can be obtained through an analytic solution. -The examples plot various outputs, which have been verified against these -solutions. These model outputs are stored as reference data and -used for continuous validation whenever models in the library change. -

-")); -end Validation; diff --git a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/package.order b/IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/package.order deleted file mode 100644 index 799d7b6441..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/package.order +++ /dev/null @@ -1 +0,0 @@ -ControlledFlowMachinePreconfigured diff --git a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/package.mo b/IBPSA/Obsolete/Fluid/Movers/Preconfigured/package.mo deleted file mode 100644 index b0ea06704a..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/package.mo +++ /dev/null @@ -1,13 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers; -package Preconfigured "Obsolete preconfigured models" - extends Modelica.Icons.Package; -annotation (preferredView="info", Documentation(info=" -

-This package contains obsolete preconfigured mover models. -

-"), -Icon(graphics={ Line( - points={{-60,0},{-20,-40},{60,40}}, - color={0,140,72}, - thickness=10)})); -end Preconfigured; diff --git a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/package.order b/IBPSA/Obsolete/Fluid/Movers/Preconfigured/package.order deleted file mode 100644 index c30661570d..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/package.order +++ /dev/null @@ -1,2 +0,0 @@ -SpeedControlled_Nrpm -Validation diff --git a/IBPSA/Obsolete/Fluid/Movers/SpeedControlled_Nrpm.mo b/IBPSA/Obsolete/Fluid/Movers/SpeedControlled_Nrpm.mo deleted file mode 100644 index 76ac0f30b4..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/SpeedControlled_Nrpm.mo +++ /dev/null @@ -1,197 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers; -model SpeedControlled_Nrpm - "Fan or pump with ideally controlled speed Nrpm as input signal" - extends IBPSA.Obsolete.Fluid.Movers.BaseClasses.PartialFlowMachine( - final preVar=IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.Speed, - final nominalValuesDefineDefaultPressureCurve=false, - final computePowerUsingSimilarityLaws=true, - final stageInputs(each final unit="1") = per.speeds, - final constInput(final unit="1") = per.constantSpeed, - filter( - final y_start=y_start, - u(final unit="1"), - y(final unit="1")), - eff( - per(final pressure = per.pressure, - final etaHydMet = per.etaHydMet, - final etaMotMet = per.etaMotMet), - r_N(start=y_start)), - gaiSpe(u(final unit="rev/min"), - final k=1/per.speed_rpm_nominal)); - - parameter Real y_start(min=0, max=1, unit="1")=0 "Initial value of speed" - annotation(Dialog(tab="Dynamics", group="Filtered speed", enable=use_inputFilter)); - - Modelica.Blocks.Interfaces.RealInput Nrpm(final unit="rev/min") - if inputType == IBPSA.Fluid.Types.InputType.Continuous - "Prescribed rotational speed" - annotation (Placement(transformation( - extent={{-20,-20},{20,20}}, - rotation=-90, - origin={0,120}), iconTransformation( - extent={{-20,-20},{20,20}}, - rotation=-90, - origin={0,120}))); - -protected - Modelica.Blocks.Math.Gain gain(final k=-1) "Pressure gain" - annotation (Placement(transformation(extent={{10,-10},{-10,10}}, - rotation=270, - origin={-10,-20}))); -initial equation - assert(per.havePressureCurve, - "SpeedControlled_Nrpm model requires to set the pressure vs. flow rate curve in record 'per'."); - -equation - connect(Nrpm, gaiSpe.u) - annotation (Line(points={{0,120},{0,80},{-2.8,80}}, color={0,0,127})); - connect(gaiSpe.y, inputSwitch.u) annotation (Line(points={{-16.6,80},{-26,80}, - {-26,50},{-22,50}}, color={0,0,127})); - connect(eff.dp, gain.u) annotation (Line(points={{-11,-50},{-6,-50},{-6,-42}, - {-10,-42},{-10,-32}}, - color={0,0,127})); - connect(gain.y, preSou.dp_in) - annotation (Line(points={{-10,-9},{-10,14},{56,14},{56,8}}, - color={0,0,127})); - if use_inputFilter then - connect(filter.y, eff.y_in) annotation (Line(points={{41,70.5},{44,70.5},{44, - 26},{-26,26},{-26,-46}}, color={0,0,127})); - else - connect(inputSwitch.y, eff.y_in) annotation (Line(points={{1,50},{44,50},{44, - 26},{-26,26},{-26,-46}}, - color={0,0,127})); - end if; - annotation (defaultComponentName="mov", - Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100, - 100}}), - graphics={ - Text( - extent={{-40,126},{-160,76}}, - textColor={0,0,127}, - visible=inputType == IBPSA.Fluid.Types.InputType.Continuous or inputType == IBPSA.Fluid.Types.InputType.Stages, - textString=DynamicSelect("Nrpm", if inputType == IBPSA.Fluid.Types.InputType.Continuous then String(Nrpm, format=".0f") else String(stage)))}), - obsolete = "Obsolete model - use IBPSA.Fluid.Movers.SpeedControlled_y instead", - Documentation(info=" -

-This model describes a fan or pump with prescribed speed in revolutions per minute. -The head is computed based on the performance curve that take as an argument -the actual volume flow rate divided by the maximum flow rate and the relative -speed of the fan. -

-
-

-See the - -User's Guide for more information. -

-", - revisions=" - -")); -end SpeedControlled_Nrpm; diff --git a/IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo b/IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo deleted file mode 100644 index fc4fff8f97..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo +++ /dev/null @@ -1,226 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers.Validation.BaseClasses; -model ControlledFlowMachine - - package Medium = IBPSA.Media.Air "Medium model"; - - Modelica.Blocks.Sources.Pulse y( - startTime=0, - offset=0, - amplitude=1, - period=120, - width=50) annotation (Placement(transformation(extent={{-140,70},{-120,90}}))); - IBPSA.Fluid.Sources.Boundary_pT sou( - redeclare package Medium = Medium, - use_p_in=false, - p=101325, - T=293.15, - nPorts=4) annotation (Placement(transformation(extent={{-90,20},{-70,40}}))); - - IBPSA.Fluid.Sensors.MassFlowRate masFloRat1(redeclare package Medium = - Medium) - annotation (Placement(transformation(extent={{60,50},{80,70}}))); - IBPSA.Fluid.Sensors.RelativePressure relPre(redeclare package Medium = - Medium) annotation (Placement(transformation( - extent={{10,-10},{-10,10}}, - origin={-10,32}))); - replaceable - IBPSA.Fluid.Movers.SpeedControlled_y fan1( - redeclare package Medium = Medium, - energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState, - redeclare IBPSA.Obsolete.Fluid.Movers.Data.Pumps.Wilo.Stratos32slash1to12 per) - constrainedby IBPSA.Fluid.Movers.SpeedControlled_y - "Fan with normalized control input between 0 and 1" - annotation (Placement(transformation(extent={{-20,50},{0,70}}))); - IBPSA.Fluid.FixedResistances.PressureDrop dp1( - redeclare package Medium = Medium, - from_dp=true, - m_flow_nominal=0.006, - dp_nominal=50000) "Pressure drop" - annotation (Placement(transformation(extent={{16,50},{36,70}}))); - IBPSA.Fluid.FixedResistances.PressureDrop dp2( - redeclare package Medium = Medium, - from_dp=true, - m_flow_nominal=0.006, - dp_nominal=50000) "Pressure drop" - annotation (Placement(transformation(extent={{16,-30},{36,-10}}))); - IBPSA.Fluid.Sensors.MassFlowRate masFloRat2( - redeclare package Medium = Medium) - annotation (Placement(transformation(extent={{60,-30},{80,-10}}))); - IBPSA.Fluid.FixedResistances.PressureDrop dp3( - redeclare package Medium = Medium, - from_dp=true, - m_flow_nominal=0.006, - dp_nominal=50000) "Pressure drop" - annotation (Placement(transformation(extent={{16,-70},{36,-50}}))); - IBPSA.Fluid.Sensors.MassFlowRate masFloRat3( - redeclare package Medium = Medium) - annotation (Placement(transformation(extent={{60,-70},{80,-50}}))); - replaceable - IBPSA.Fluid.Movers.FlowControlled_dp fan3( - redeclare package Medium = Medium, - m_flow_nominal=6000/3600*1.2, - energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState, - redeclare IBPSA.Obsolete.Fluid.Movers.Data.Pumps.Wilo.Stratos32slash1to12 per) - constrainedby IBPSA.Fluid.Movers.FlowControlled_dp - "Fan with head as input" - annotation (Placement(transformation(extent={{-20,-70},{0,-50}}))); - replaceable - IBPSA.Fluid.Movers.FlowControlled_m_flow fan2( - redeclare package Medium = Medium, - m_flow_nominal=6000/3600*1.2, - energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState, - redeclare IBPSA.Obsolete.Fluid.Movers.Data.Pumps.Wilo.Stratos32slash1to12 per) - constrainedby IBPSA.Fluid.Movers.FlowControlled_m_flow - "Fan with mass flow rate as input" - annotation (Placement(transformation(extent={{-20,-30},{0,-10}}))); - IBPSA.Fluid.FixedResistances.PressureDrop dp4( - redeclare package Medium = Medium, - from_dp=true, - m_flow_nominal=0.006, - dp_nominal=50000) "Pressure drop" - annotation (Placement(transformation(extent={{16,100},{36,120}}))); - IBPSA.Fluid.Sensors.MassFlowRate masFloRat4( - redeclare package Medium = Medium) - annotation (Placement(transformation(extent={{60,100},{80,120}}))); - replaceable - IBPSA.Obsolete.Fluid.Movers.SpeedControlled_Nrpm fan4( - redeclare package Medium = Medium, - energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState, - redeclare IBPSA.Obsolete.Fluid.Movers.Data.Pumps.Wilo.Stratos32slash1to12 per) - constrainedby IBPSA.Obsolete.Fluid.Movers.SpeedControlled_Nrpm - "Fan with RPM as control input" - annotation (Placement(transformation(extent={{-20,100},{0,120}}))); - Modelica.Blocks.Math.Gain gain(k=3580) "Converts y to nominal rpm" - annotation (Placement(transformation(extent={{-60,130},{-40,150}}))); - IBPSA.Fluid.FixedResistances.PressureDrop dp5( - m_flow_nominal=6000/3600*1.2, - redeclare package Medium = Medium, - dp_nominal=300, - from_dp=true) "Pressure drop" - annotation (Placement(transformation(extent={{-52,50},{-32,70}}))); - IBPSA.Fluid.FixedResistances.PressureDrop dp6( - m_flow_nominal=6000/3600*1.2, - redeclare package Medium = Medium, - dp_nominal=300, - from_dp=true) "Pressure drop" - annotation (Placement(transformation(extent={{-52,-30},{-32,-10}}))); - IBPSA.Fluid.FixedResistances.PressureDrop dp7( - m_flow_nominal=6000/3600*1.2, - redeclare package Medium = Medium, - dp_nominal=300, - from_dp=true) "Pressure drop" - annotation (Placement(transformation(extent={{-52,-70},{-32,-50}}))); - IBPSA.Fluid.FixedResistances.PressureDrop dp8( - m_flow_nominal=6000/3600*1.2, - redeclare package Medium = Medium, - dp_nominal=300, - from_dp=true) "Pressure drop" - annotation (Placement(transformation(extent={{-52,100},{-32,120}}))); - IBPSA.Fluid.Sources.Boundary_pT sin( - redeclare package Medium = Medium, - use_p_in=false, - p=101325, - T=293.15, - nPorts=4) annotation (Placement(transformation(extent={{142,20},{122,40}}))); -equation - - connect(fan1.port_a, relPre.port_b) annotation (Line( - points={{-20,60},{-20,32}}, - color={0,127,255})); - connect(fan1.port_b, relPre.port_a) annotation (Line( - points={{5.55112e-16,60},{5.55112e-16,46},{0,32},{5.55112e-16,32}}, - color={0,127,255})); - connect(fan1.port_b, dp1.port_a) annotation (Line( - points={{5.55112e-16,60},{16,60}}, - color={0,127,255})); - connect(fan2.port_b, dp2.port_a) annotation (Line( - points={{5.55112e-16,-20},{16,-20}}, - color={0,127,255})); - connect(fan3.port_b, dp3.port_a) annotation (Line( - points={{5.55112e-16,-60},{16,-60}}, - color={0,127,255})); - connect(fan4.port_b, dp4.port_a) annotation (Line( - points={{5.55112e-16,110},{16,110}}, - color={0,127,255})); - connect(gain.y, fan4.Nrpm) annotation (Line( - points={{-39,140},{-10,140},{-10,122}}, - color={0,0,127})); - connect(masFloRat1.m_flow, fan2.m_flow_in) annotation (Line( - points={{70,71},{70,86},{42,86},{42,4},{-10,4},{-10,-8}}, - color={0,0,127})); - connect(relPre.p_rel, fan3.dp_in) annotation (Line( - points={{-10,23},{-10,8},{-24,8},{-24,-40},{-10,-40},{-10,-48}}, - color={0,0,127})); - connect(dp8.port_b, fan4.port_a) annotation (Line( - points={{-32,110},{-20,110}}, - color={0,127,255})); - connect(dp5.port_b, fan1.port_a) annotation (Line( - points={{-32,60},{-20,60}}, - color={0,127,255})); - connect(dp6.port_b, fan2.port_a) annotation (Line( - points={{-32,-20},{-20,-20}}, - color={0,127,255})); - connect(dp7.port_b, fan3.port_a) annotation (Line( - points={{-32,-60},{-20,-60}}, - color={0,127,255})); - connect(y.y, fan1.y) annotation (Line( - points={{-119,80},{-10,80},{-10,72}}, - color={0,0,127})); - connect(y.y, gain.u) annotation (Line( - points={{-119,80},{-80,80},{-80,140},{-62,140}}, - color={0,0,127})); - connect(dp8.port_a, sou.ports[1]) annotation (Line( - points={{-52,110},{-62,110},{-62,28.5},{-70,28.5}}, - color={0,127,255})); - connect(dp5.port_a, sou.ports[2]) annotation (Line( - points={{-52,60},{-60,60},{-60,29.5},{-70,29.5}}, - color={0,127,255})); - connect(dp6.port_a, sou.ports[3]) annotation (Line( - points={{-52,-20},{-60,-20},{-60,30.5},{-70,30.5}}, - color={0,127,255})); - connect(dp7.port_a, sou.ports[4]) annotation (Line( - points={{-52,-60},{-62,-60},{-62,31.5},{-70,31.5}}, - color={0,127,255})); - connect(dp4.port_b, masFloRat4.port_a) annotation (Line( - points={{36,110},{60,110}}, - color={0,127,255})); - connect(dp1.port_b, masFloRat1.port_a) annotation (Line( - points={{36,60},{60,60}}, - color={0,127,255})); - connect(dp2.port_b, masFloRat2.port_a) annotation (Line( - points={{36,-20},{60,-20}}, - color={0,127,255})); - connect(dp3.port_b, masFloRat3.port_a) annotation (Line( - points={{36,-60},{60,-60}}, - color={0,127,255})); - connect(masFloRat4.port_b, sin.ports[1]) annotation (Line( - points={{80,110},{102,110},{102,28.5},{122,28.5}}, - color={0,127,255})); - connect(masFloRat1.port_b, sin.ports[2]) annotation (Line( - points={{80,60},{100,60},{100,29.5},{122,29.5}}, - color={0,127,255})); - connect(masFloRat2.port_b, sin.ports[3]) annotation (Line( - points={{80,-20},{100,-20},{100,30.5},{122,30.5}}, - color={0,127,255})); - connect(masFloRat3.port_b, sin.ports[4]) annotation (Line( - points={{80,-60},{102,-60},{102,31.5},{122,31.5}}, - color={0,127,255})); - annotation ( - Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-160,-100},{160, - 160}})), - Icon(coordinateSystem(preserveAspectRatio=true, extent={{-160,-100},{160,160}})), - Documentation(info=" -This example demonstrates the use of the flow model with four different configuration. -At steady-state, all flow models have the same mass flow rate and pressure difference. -"), revisions=" - -"); -end ControlledFlowMachine; diff --git a/IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/package.mo b/IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/package.mo deleted file mode 100644 index 40e1f66c10..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/package.mo +++ /dev/null @@ -1,9 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers.Validation; -package BaseClasses "Package with base classes for obsolete validation models" - extends Modelica.Icons.BasesPackage; -annotation (preferredView="info", Documentation(info=" -

-This package contains base classes for obsolete validation models. -

-")); -end BaseClasses; diff --git a/IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/package.order b/IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/package.order deleted file mode 100644 index e50c2d939c..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/package.order +++ /dev/null @@ -1 +0,0 @@ -ControlledFlowMachine diff --git a/IBPSA/Obsolete/Fluid/Movers/Validation/ControlledFlowMachine.mo b/IBPSA/Obsolete/Fluid/Movers/Validation/ControlledFlowMachine.mo deleted file mode 100644 index 2097d009c6..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Validation/ControlledFlowMachine.mo +++ /dev/null @@ -1,37 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers.Validation; -model ControlledFlowMachine "Fans with different control signals as input" - extends Modelica.Icons.Example; - extends IBPSA.Obsolete.Fluid.Movers.Validation.BaseClasses.ControlledFlowMachine( - fan4(addPowerToMedium=false, use_inputFilter=false, - energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial), - fan1(addPowerToMedium=false, - energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial), - fan2(addPowerToMedium=false, use_inputFilter=false, - energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial), - fan3(addPowerToMedium=false, use_inputFilter=false, - energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)); - - annotation ( -experiment(Tolerance=1e-6, StopTime=600), -__Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachine.mos" - "Simulate and plot"), - Documentation(info=" -This example demonstrates the use of the flow model with four different configurations. -At steady-state, all flow models have the same mass flow rate and pressure difference. -Note that addPowerToMedium=false since otherwise, -Dymola computes the enthalpy change of the component as a fraction (k*m_flow+P_internal)/m_flow -which leads to an error because of 0/0 at zero flow rate. -", revisions=" - -"), - Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-160,-100},{160, - 160}}))); -end ControlledFlowMachine; diff --git a/IBPSA/Obsolete/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mo b/IBPSA/Obsolete/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mo deleted file mode 100644 index 420203e7d7..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mo +++ /dev/null @@ -1,30 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers.Validation; -model ControlledFlowMachineDynamic - "Fans with different control signals as input and a dynamic speed signal" - extends Modelica.Icons.Example; - extends IBPSA.Obsolete.Fluid.Movers.Validation.BaseClasses.ControlledFlowMachine( - fan4(energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial), - fan1(energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial), - fan2(energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial), - fan3(energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)); - annotation ( -experiment(Tolerance=1e-6, StopTime=600), -__Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mos" - "Simulate and plot"), - Documentation(info=" -This example demonstrates the use of the flow model with four different configurations. -At steady-state, all flow models have the same mass flow rate and pressure difference. -", revisions=" - -"), -Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-160,-100},{160, 160}}))); - -end ControlledFlowMachineDynamic; diff --git a/IBPSA/Obsolete/Fluid/Movers/Validation/SpeedControlled_Nrpm.mo b/IBPSA/Obsolete/Fluid/Movers/Validation/SpeedControlled_Nrpm.mo deleted file mode 100644 index f170f57e6d..0000000000 --- a/IBPSA/Obsolete/Fluid/Movers/Validation/SpeedControlled_Nrpm.mo +++ /dev/null @@ -1,58 +0,0 @@ -within IBPSA.Obsolete.Fluid.Movers.Validation; -model SpeedControlled_Nrpm "Fan with zero mass flow rate and speed as input" - extends Modelica.Icons.Example; - extends IBPSA.Fluid.Movers.Validation.BaseClasses.FlowMachine_ZeroFlow( - gain(k=1500), - redeclare IBPSA.Obsolete.Fluid.Movers.SpeedControlled_Nrpm floMacSta( - redeclare package Medium = Medium, - per(pressure(V_flow={0,m_flow_nominal,2*m_flow_nominal}/1.2, - dp={2*dp_nominal,dp_nominal,0})), - use_inputFilter=false, - energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState), - redeclare IBPSA.Obsolete.Fluid.Movers.SpeedControlled_Nrpm floMacDyn( - redeclare package Medium = Medium, - per(pressure(V_flow={0,m_flow_nominal,2*m_flow_nominal}/1.2, - dp={2*dp_nominal,dp_nominal,0})), - use_inputFilter=false, - energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)); - -equation - connect(gain.y, floMacSta.Nrpm) annotation (Line( - points={{-25,100},{30,100},{30,92}}, - color={0,0,127})); - connect(gain.y, floMacDyn.Nrpm) annotation (Line( - points={{-25,100},{10,100},{10,30},{30,30},{30,12}}, - color={0,0,127})); - annotation ( - Diagram(coordinateSystem(preserveAspectRatio=false,extent={{-100,-100},{160, - 160}}), graphics), -experiment(Tolerance=1e-08, StopTime=1.0), -__Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/SpeedControlled_Nrpm.mos" - "Simulate and plot"), - Documentation(info=" -

-This example demonstrates and tests the use of a flow machine whose mass flow rate is reduced to zero. -

-

-The fans have been configured as steady-state models. -This ensures that the actual speed is equal to the input signal. -

-", revisions=" - -")); -end SpeedControlled_Nrpm; diff --git a/IBPSA/Obsolete/Fluid/Movers/Validation/package.order b/IBPSA/Obsolete/Fluid/Movers/Validation/package.order index b8a076a90b..efadf92aae 100644 --- a/IBPSA/Obsolete/Fluid/Movers/Validation/package.order +++ b/IBPSA/Obsolete/Fluid/Movers/Validation/package.order @@ -1,7 +1,3 @@ -ControlledFlowMachine -ControlledFlowMachineDynamic PowerEuler PowerExact PowerSimplified -SpeedControlled_Nrpm -BaseClasses diff --git a/IBPSA/Obsolete/Fluid/Movers/package.order b/IBPSA/Obsolete/Fluid/Movers/package.order index 02faee82ba..52aa3d53a4 100644 --- a/IBPSA/Obsolete/Fluid/Movers/package.order +++ b/IBPSA/Obsolete/Fluid/Movers/package.order @@ -1,6 +1 @@ -SpeedControlled_Nrpm -Preconfigured -Data -Examples Validation -BaseClasses From a82b0f59471f1e86b04023da8a599c0ab132d4ca Mon Sep 17 00:00:00 2001 From: hcasperfu Date: Wed, 28 Aug 2024 09:52:37 -0700 Subject: [PATCH 2/3] removed mos files --- .../Fluid/Movers/Examples/MoverContinuous.mos | 7 ---- .../Fluid/Movers/Examples/MoverParameter.mos | 7 ---- .../Fluid/Movers/Examples/MoverStages.mos | 7 ---- .../ControlledFlowMachinePreconfigured.mos | 24 ----------- .../Validation/ControlledFlowMachine.mos | 24 ----------- .../ControlledFlowMachineDynamic.mos | 24 ----------- .../Validation/SpeedControlled_Nrpm.mos | 40 ------------------- 7 files changed, 133 deletions(-) delete mode 100644 IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverContinuous.mos delete mode 100644 IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverParameter.mos delete mode 100644 IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverStages.mos delete mode 100644 IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Preconfigured/Validation/ControlledFlowMachinePreconfigured.mos delete mode 100644 IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachine.mos delete mode 100644 IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mos delete mode 100644 IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/SpeedControlled_Nrpm.mos diff --git a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverContinuous.mos b/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverContinuous.mos deleted file mode 100644 index a1c2f8f8f9..0000000000 --- a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverContinuous.mos +++ /dev/null @@ -1,7 +0,0 @@ -simulateModel("IBPSA.Obsolete.Fluid.Movers.Examples.MoverContinuous", stopTime=1, method="CVode", tolerance=1e-06, resultFile="MoverContinuousObsolete"); -createPlot(id=1, -position={15, 10, 586, 422}, -y={"pump_Nrpm.m_flow", "pump_dp.m_flow", "pump_m_flow.m_flow", "pump_y.m_flow"}, -range={0.0, 1.0, -0.2, 2.2}, -grid=true, -colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}}); diff --git a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverParameter.mos b/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverParameter.mos deleted file mode 100644 index 49835b118c..0000000000 --- a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverParameter.mos +++ /dev/null @@ -1,7 +0,0 @@ -simulateModel("IBPSA.Obsolete.Fluid.Movers.Examples.MoverParameter", stopTime=1, method="CVode", tolerance=1e-06, resultFile="MoverParameterObsolete"); -createPlot(id=1, -position={15, 10, 586, 422}, -y={"pump_Nrpm.m_flow", "pump_dp.m_flow", "pump_m_flow.m_flow", "pump_y.m_flow"}, -range={0.0, 1.0, -0.2, 2.2}, -grid=true, -colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}}); diff --git a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverStages.mos b/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverStages.mos deleted file mode 100644 index 903ae30ff8..0000000000 --- a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverStages.mos +++ /dev/null @@ -1,7 +0,0 @@ -simulateModel("IBPSA.Obsolete.Fluid.Movers.Examples.MoverStages", stopTime=1, method="CVode", tolerance=1e-06, resultFile="MoverStagesObsolete"); -createPlot(id=1, -position={15, 10, 586, 422}, -y={"pump_Nrpm.m_flow", "pump_dp.m_flow", "pump_m_flow.m_flow", "pump_y.m_flow"}, -range={0.0, 1.0, -0.2, 2.2}, -grid=true, -colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}}); diff --git a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Preconfigured/Validation/ControlledFlowMachinePreconfigured.mos b/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Preconfigured/Validation/ControlledFlowMachinePreconfigured.mos deleted file mode 100644 index ecf55f1f09..0000000000 --- a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Preconfigured/Validation/ControlledFlowMachinePreconfigured.mos +++ /dev/null @@ -1,24 +0,0 @@ -simulateModel("IBPSA.Obsolete.Fluid.Movers.Preconfigured.Validation.ControlledFlowMachinePreconfigured", method="CVode", tolerance=1e-6, stopTime=600, resultFile="ControlledFlowMachinePreconfiguredObsolete"); -createPlot(id = 3, - position = {55, 50, 750, 480}, - y = {"fan1.m_flow", "fan2.m_flow", "fan3.m_flow", "fan4.m_flow"}, - range = {0, 600, 2.5, 0.5}, - autoscale = true, - autoerase = true, - autoreplot = true, - grid = true, - color = true, - leftTitleType = 1, - bottomTitleType = 1); -createPlot(id = 3, - position = {55, 50, 750, 237}, - y = {"fan1.dp", "fan2.dp", "fan3.dp", "fan4.dp"}, - range = {0, 600, 700.0, 0}, - autoscale = true, - autoerase = true, - autoreplot = true, - grid = true, - color = true, - subPlot = 2, - leftTitleType = 1, - bottomTitleType = 1); diff --git a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachine.mos b/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachine.mos deleted file mode 100644 index 4434d84e4e..0000000000 --- a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachine.mos +++ /dev/null @@ -1,24 +0,0 @@ -simulateModel("IBPSA.Obsolete.Fluid.Movers.Validation.ControlledFlowMachine", method="CVode", tolerance=1e-6, stopTime=600, resultFile="ControlledFlowMachineObsolete"); -createPlot(id = 3, - position = {55, 50, 750, 480}, - y = {"fan1.m_flow", "fan2.m_flow", "fan3.m_flow", "fan4.m_flow"}, - range = {0, 600, 2.5, 0.5}, - autoscale = true, - autoerase = true, - autoreplot = true, - grid = true, - color = true, - leftTitleType = 1, - bottomTitleType = 1); -createPlot(id = 3, - position = {55, 50, 750, 237}, - y = {"fan1.dp", "fan2.dp", "fan3.dp", "fan4.dp"}, - range = {0, 1, 600.0, 0}, - autoscale = true, - autoerase = true, - autoreplot = true, - grid = true, - color = true, - subPlot = 2, - leftTitleType = 1, - bottomTitleType = 1); diff --git a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mos b/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mos deleted file mode 100644 index dce12c1dba..0000000000 --- a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mos +++ /dev/null @@ -1,24 +0,0 @@ -simulateModel("IBPSA.Obsolete.Fluid.Movers.Validation.ControlledFlowMachineDynamic", method="CVode", tolerance=1e-6, stopTime=600, resultFile="ControlledFlowMachineDynamicObsolete"); -createPlot(id = 3, - position = {55, 50, 750, 480}, - y = {"fan1.m_flow", "fan2.m_flow", "fan3.m_flow", "fan4.m_flow"}, - range = {0, 600, 2.5, 0.5}, - autoscale = true, - autoerase = true, - autoreplot = true, - grid = true, - color = true, - leftTitleType = 1, - bottomTitleType = 1); -createPlot(id = 3, - position = {55, 50, 750, 237}, - y = {"fan1.dp", "fan2.dp", "fan3.dp", "fan4.dp"}, - range = {0, 600, 700.0, 0}, - autoscale = true, - autoerase = true, - autoreplot = true, - grid = true, - color = true, - subPlot = 2, - leftTitleType = 1, - bottomTitleType = 1); diff --git a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/SpeedControlled_Nrpm.mos b/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/SpeedControlled_Nrpm.mos deleted file mode 100644 index 7ea200808d..0000000000 --- a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/SpeedControlled_Nrpm.mos +++ /dev/null @@ -1,40 +0,0 @@ -simulateModel("IBPSA.Obsolete.Fluid.Movers.Validation.SpeedControlled_Nrpm", method="CVode", tolerance=1e-08, stopTime=1.0, resultFile="SpeedControlled_Nrpm"); -removePlots(); -createPlot(id = 4, - filename = "SpeedControlled_Nrpm.mat", - position = {441, 13, 281, 255}, - y = {"gain.u"}, - range = {0, 1, 1, -0.2}, - autoscale = true, - autoerase = true, - autoreplot = true, - grid = true, - color = true, - leftTitleType = 1, - bottomTitleType = 1); -createPlot(id = 5, - filename = "SpeedControlled_Nrpm.mat", - position = {13, 10, 300, 280}, - x = "floMacSta.VMachine_flow", - y = {"floMacSta.dpMachine", "floMacDyn.dpMachine"}, - range = {0, 0.0009, 2050.0, 1550.0}, - autoscale = true, - autoerase = true, - autoreplot = true, - grid = true, - color = true, - leftTitleType = 1, - bottomTitleType = 1); -createPlot(id = 6, - filename = "SpeedControlled_Nrpm.mat", - position = {200, 10, 400, 280}, - x = "time", - y = {"floMacSta.VMachine_flow", "floMacDyn.VMachine_flow"}, - range = {0, 0.001, 2100.0, 1500.0}, - autoscale = true, - autoerase = true, - autoreplot = true, - grid = true, - color = true, - leftTitleType = 1, - bottomTitleType = 1); From 94cd4cb7f0afe8c3c6a52e5b0e7b7ea560926cfa Mon Sep 17 00:00:00 2001 From: hcasperfu Date: Wed, 28 Aug 2024 09:53:29 -0700 Subject: [PATCH 3/3] removed results files --- ..._Fluid_Movers_Examples_MoverContinuous.txt | 17 -------------- ...e_Fluid_Movers_Examples_MoverParameter.txt | 17 -------------- ...lete_Fluid_Movers_Examples_MoverStages.txt | 17 -------------- ...ion_ControlledFlowMachinePreconfigured.txt | 22 ------------------- ...overs_Validation_ControlledFlowMachine.txt | 22 ------------------- ...alidation_ControlledFlowMachineDynamic.txt | 22 ------------------- ...Movers_Validation_SpeedControlled_Nrpm.txt | 19 ---------------- 7 files changed, 136 deletions(-) delete mode 100644 IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverContinuous.txt delete mode 100644 IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverParameter.txt delete mode 100644 IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverStages.txt delete mode 100644 IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Preconfigured_Validation_ControlledFlowMachinePreconfigured.txt delete mode 100644 IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_ControlledFlowMachine.txt delete mode 100644 IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt delete mode 100644 IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_SpeedControlled_Nrpm.txt diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverContinuous.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverContinuous.txt deleted file mode 100644 index a397a40740..0000000000 --- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverContinuous.txt +++ /dev/null @@ -1,17 +0,0 @@ -last-generated=2017-12-04 -statistics-initialization= -{ - "numerical Jacobians": "0", - "nonlinear": "1, 0, 1, 1" -} -statistics-simulation= -{ - "numerical Jacobians": "0", - "nonlinear": "1, 0, 1, 1", - "linear": " " -} -pump_y.m_flow=[0e+00, 4.017464083852141e-02, 4.59699484860468e-02, 5.415536902887684e-02, 6.541527180240084e-02, 7.98371124496001e-02, 9.584896481196611e-02, 1.118608410354876e-01, 1.27872738125061e-01, 1.438846381860275e-01, 1.598965650779216e-01, 1.759084919698156e-01, 1.919204188617296e-01, 2.079323606547648e-01, 2.239442905180493e-01, 2.399562054801814e-01, 2.559681592030562e-01, 2.71980103967453e-01, 2.879920189295807e-01, 3.040039875535634e-01, 3.200159323179692e-01, 3.360278711397716e-01, 3.520398159041417e-01, 3.68051760668574e-01, 3.840637292925567e-01, 4.000756442546844e-01, 4.160876128788093e-01, 4.320995337835847e-01, 4.481115024075674e-01, 4.641234710315501e-01, 4.801353919362899e-01, 4.961473307581278e-01, 5.121592993821106e-01, 5.28171220287028e-01, 5.441831889110108e-01, 5.601951575349934e-01, 5.762070784399109e-01, 5.922190470638936e-01, 6.082310156878764e-01, 6.242429843118591e-01, 6.40254905216599e-01, 6.562668738407592e-01, 6.72278842464742e-01, 6.882907037650147e-01, 7.043026723890684e-01, 7.203146410133354e-01, 7.363265619178976e-01, 7.523385305418803e-01, 7.68350499165863e-01, 7.843624200707805e-01, 8.003743886947632e-01, 8.163863573185184e-01, 8.323983259422736e-01, 8.484102945660288e-01, 8.644221677530756e-01, 8.804341363768308e-01, 8.964461050004722e-01, 9.124580736243409e-01, 9.284700422480962e-01, 9.444820108718514e-01, 9.604938840588981e-01, 9.76505852682227e-01, 9.925178213062664e-01, 1.008529789930022e+00, 1.024541758553493e+00, 1.040553727176964e+00, 1.056565600363939e+00, 1.072577568987979e+00, 1.088589537612018e+00, 1.104601506236029e+00, 1.120613474859386e+00, 1.136625443482857e+00, 1.152637316669691e+00, 1.16864928529373e+00, 1.18466125391777e+00, 1.200673222541809e+00, 1.21668519116528e+00, 1.232697159788751e+00, 1.248709128412222e+00, 1.264721001599482e+00, 1.280732970223521e+00, 1.296744938847447e+00, 1.312756788262311e+00, 1.32876875688635e+00, 1.344780725510389e+00, 1.360792598697365e+00, 1.376804567320836e+00, 1.392816535944307e+00, 1.408828504568062e+00, 1.424840473192102e+00, 1.440852441816141e+00, 1.456864315003259e+00, 1.47287628362673e+00, 1.488888252250201e+00, 1.504900220873927e+00, 1.520912189497853e+00, 1.536924158121892e+00, 1.552936031309152e+00, 1.568947999932623e+00, 1.584959968556094e+00, 1.600971937179565e+00] -pump_Nrpm.m_flow=[0e+00, 4.079784093759504e-02, 4.753518887752266e-02, 5.756009452662184e-02, 7.143276329812263e-02, 8.873258398540762e-02, 1.065235534328043e-01, 1.243145386042879e-01, 1.421055527551738e-01, 1.598965611013239e-01, 1.776875827027884e-01, 1.954786192054186e-01, 2.132696706092011e-01, 2.310607071118268e-01, 2.488517452602949e-01, 2.666427685076551e-01, 2.844338480678466e-01, 3.022248713151979e-01, 3.200159243647649e-01, 3.378069741227761e-01, 3.555980271723699e-01, 3.733891067326057e-01, 3.911801299799748e-01, 4.089711830295685e-01, 4.267622327875797e-01, 4.445532858371735e-01, 4.623443653975071e-01, 4.80135391936361e-01, 4.979264416943899e-01, 5.157175212547057e-01, 5.335085179912372e-01, 5.512996273538932e-01, 5.690906771119044e-01, 5.868816738488267e-01, 6.04672783211092e-01, 6.22463832969103e-01, 6.402548893102793e-01, 6.580459390682906e-01, 6.758369888263017e-01, 6.936280981889578e-01, 7.114190949254893e-01, 7.292102042880385e-01, 7.470012540461564e-01, 7.647922507826879e-01, 7.825833601453439e-01, 8.003744099033551e-01, 8.181654662445313e-01, 8.359565160025425e-01, 8.537475657605537e-01, 8.715386221017301e-01, 8.893296718597412e-01, 9.071207812218601e-01, 9.249118309799027e-01, 9.427028807376612e-01, 9.604938840586851e-01, 9.782849338164434e-01, 9.960760431787202e-01, 1.013867033332173e+00, 1.031658202298511e+00, 1.049449252055985e+00, 1.067240195773856e+00, 1.08503124553133e+00, 1.102822295288804e+00, 1.120613464255568e+00, 1.138404514013042e+00, 1.156195563771937e+00, 1.173986507488388e+00, 1.191777676454157e+00, 1.209568726212199e+00, 1.227359775970226e+00, 1.245150825728284e+00, 1.262941875486327e+00, 1.280732938410504e+00, 1.298523988168546e+00, 1.316315037926589e+00, 1.334106087684631e+00, 1.351897137442674e+00, 1.369688306408869e+00, 1.387479356166343e+00, 1.405270299884215e+00, 1.423061349641689e+00, 1.440852399399037e+00, 1.458643568365927e+00, 1.476434618123401e+00, 1.494225667880875e+00, 1.512016611598746e+00, 1.52980766135622e+00, 1.5475988303227e+00, 1.565389880080458e+00, 1.583180929837932e+00, 1.600971979596828e+00, 1.618762923313278e+00, 1.636554092279047e+00, 1.65434514203709e+00, 1.672136191795116e+00, 1.689927241553175e+00, 1.707718291311217e+00, 1.725509354235394e+00, 1.743300403993436e+00, 1.761091453752047e+00, 1.778882503509521e+00] -pump_dp.m_flow=[0e+00, 9.328862485460804e-02, 1.838471034664851e-01, 2.691358084246098e-01, 3.469961350539961e-01, 4.158410679565265e-01, 4.748456847303785e-01, 5.241375551932522e-01, 5.649875468258587e-01, 6.000000118431602e-01, 6.324555230465049e-01, 6.633249539146034e-01, 6.928203183035077e-01, 7.211102975030332e-01, 7.483314855800669e-01, 7.745966756901084e-01, 8.000000208337813e-01, 8.246211366071936e-01, 8.485281298378653e-01, 8.717798049166876e-01, 8.944271736095353e-01, 9.165151261969088e-01, 9.380831743802622e-01, 9.591662796570509e-01, 9.797958840925274e-01, 1e+00, 1.019803900312544e+00, 1.039230445202846e+00, 1.058300492890813e+00, 1.077032939167407e+00, 1.095445134296584e+00, 1.113552923681775e+00, 1.131370914685792e+00, 1.148912526157194e+00, 1.166190379676207e+00, 1.183215985821968e+00, 1.200000023808676e+00, 1.216552488106645e+00, 1.232882865047698e+00, 1.24899961851953e+00, 1.264911046128892e+00, 1.280624872064055e+00, 1.296148201171322e+00, 1.311487663792826e+00, 1.326649907841322e+00, 1.341640847790721e+00, 1.356466042599291e+00, 1.371130945035329e+00, 1.385640636655137e+00, 1.399999962520297e+00, 1.414213538169861e+00, 1.428285731305097e+00, 1.442220595080706e+00, 1.456022063415179e+00, 1.469693869926698e+00, 1.483239634637772e+00, 1.496662971168648e+00, 1.50996685974631e+00, 1.523154638251184e+00, 1.536229167720526e+00, 1.549193351457414e+00, 1.562049966601106e+00, 1.574801558156071e+00, 1.587450748724405e+00, 1.600000041708863e+00, 1.612451582894278e+00, 1.624807683109971e+00, 1.637070516209296e+00, 1.649242273233488e+00, 1.66132474232439e+00, 1.673320069245549e+00, 1.685229922946458e+00, 1.697056259747003e+00, 1.708800770355006e+00, 1.720465052955393e+00, 1.732050776481628e+00, 1.743559609854671e+00, 1.754992864396032e+00, 1.766352209039176e+00, 1.777638888044021e+00, 1.788854347244494e+00, 1.799999949665642e+00, 1.811077006604344e+00, 1.822086710164629e+00, 1.833030252444586e+00, 1.843908880108285e+00, 1.854723676505875e+00, 1.865475768696372e+00, 1.876166348768975e+00, 1.886796251192975e+00, 1.897366668069226e+00, 1.907878371388204e+00, 1.918332559342712e+00, 1.928730122775119e+00, 1.939071896149958e+00, 1.949358833139192e+00, 1.959591768219581e+00, 1.969771475339181e+00, 1.979898910319533e+00, 1.989974846787326e+00, 2e+00] -pump_m_flow.m_flow=[0e+00, 2e-02, 4e-02, 6e-02, 8e-02, 1e-01, 1.2e-01, 1.4e-01, 1.6e-01, 1.8e-01, 2e-01, 2.2e-01, 2.4e-01, 2.6e-01, 2.8e-01, 3e-01, 3.2e-01, 3.4e-01, 3.6e-01, 3.8e-01, 4e-01, 4.2e-01, 4.4e-01, 4.6e-01, 4.8e-01, 5e-01, 5.2e-01, 5.4e-01, 5.600000000000001e-01, 5.8e-01, 6e-01, 6.2e-01, 6.4e-01, 6.6e-01, 6.8e-01, 7e-01, 7.2e-01, 7.4e-01, 7.6e-01, 7.8e-01, 8e-01, 8.2e-01, 8.4e-01, 8.6e-01, 8.8e-01, 9e-01, 9.2e-01, 9.399999999999999e-01, 9.6e-01, 9.8e-01, 1e+00, 1.02e+00, 1.04e+00, 1.06e+00, 1.08e+00, 1.1e+00, 1.12e+00, 1.14e+00, 1.16e+00, 1.18e+00, 1.2e+00, 1.22e+00, 1.24e+00, 1.26e+00, 1.28e+00, 1.3e+00, 1.32e+00, 1.34e+00, 1.36e+00, 1.38e+00, 1.4e+00, 1.42e+00, 1.44e+00, 1.46e+00, 1.48e+00, 1.5e+00, 1.52e+00, 1.54e+00, 1.56e+00, 1.58e+00, 1.6e+00, 1.62e+00, 1.64e+00, 1.66e+00, 1.68e+00, 1.7e+00, 1.72e+00, 1.74e+00, 1.76e+00, 1.78e+00, 1.8e+00, 1.82e+00, 1.84e+00, 1.86e+00, 1.88e+00, 1.9e+00, 1.92e+00, 1.94e+00, 1.96e+00, 1.98e+00, 2e+00] -time=[0e+00, 1e+00] diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverParameter.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverParameter.txt deleted file mode 100644 index c83061bc8c..0000000000 --- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverParameter.txt +++ /dev/null @@ -1,17 +0,0 @@ -last-generated=2020-05-26 -statistics-initialization= -{ - "nonlinear": "0, 1, 1, 1", - "numerical Jacobians": "0" -} -statistics-simulation= -{ - "linear": " ", - "nonlinear": " ", - "numerical Jacobians": "0" -} -time=[0e+00, 1e+00] -pump_Nrpm.m_flow=[1.778882503509521e+00, 1.778882503509521e+00] -pump_dp.m_flow=[2e+00, 2e+00] -pump_m_flow.m_flow=[2e+00, 2e+00] -pump_y.m_flow=[1.600971937179565e+00, 1.600971937179565e+00] diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverStages.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverStages.txt deleted file mode 100644 index d5dab48795..0000000000 --- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverStages.txt +++ /dev/null @@ -1,17 +0,0 @@ -last-generated=2018-06-24 -statistics-initialization= -{ - "nonlinear": "1, 0, 1, 1", - "numerical Jacobians": "0" -} -statistics-simulation= -{ - "linear": " ", - "nonlinear": "1, 0, 1, 1", - "numerical Jacobians": "0" -} -pump_y.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00] -pump_Nrpm.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00] -pump_dp.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00] -pump_m_flow.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00] -time=[0e+00, 1e+00] diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Preconfigured_Validation_ControlledFlowMachinePreconfigured.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Preconfigured_Validation_ControlledFlowMachinePreconfigured.txt deleted file mode 100644 index cef52adf07..0000000000 --- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Preconfigured_Validation_ControlledFlowMachinePreconfigured.txt +++ /dev/null @@ -1,22 +0,0 @@ -last-generated=2024-06-05 -statistics-initialization= -{ - "nonlinear": "1, 1, 0, 1, 1", - "numerical Jacobians": "0" -} -statistics-simulation= -{ - "linear": " ", - "nonlinear": "1, 1, 0, 1, 1", - "number of continuous time states": "20", - "numerical Jacobians": "0" -} -time=[0e+00, 6e+02] -fan1.m_flow=[0e+00, 1.280510067939758e+00, 1.5494384765625e+00, 1.606707096099854e+00, 1.618817329406738e+00, 1.621376872062683e+00, 1.621917366981506e+00, 1.622032761573792e+00, 1.622056722640991e+00, 1.622061610221863e+00, 1.622062683105469e+00, 8.762909770011902e-01, 2.096612751483917e-01, 1.863026805222034e-02, 1.363298273645335e-03, 9.019421122502536e-05, 5.623015113087604e-06, 3.633108462963697e-07, -7.016069503151812e-08, -1.35560185299255e-08, -8.430106390733272e-09, 7.456924319267273e-01, 1.32401978969574e+00, 1.535150408744812e+00, 1.598639130592346e+00, 1.616043090820312e+00, 1.62056040763855e+00, 1.621697425842285e+00, 1.621976017951965e+00, 1.622043251991272e+00, 1.622058033943176e+00, 8.763427734375e-01, 2.092801481485367e-01, 1.863043941557407e-02, 1.362975453957902e-03, 9.014781971927732e-05, 5.586143288383028e-06, 3.412483238207642e-07, 2.173692337237298e-08, 2.191882231272757e-10, -1.424723450327292e-08, 7.565710544586137e-01, 1.32555365562439e+00, 1.535158157348633e+00, 1.598642349243164e+00, 1.616046547889709e+00, 1.620560646057129e+00, 1.621695995330811e+00, 1.621975302696228e+00, 1.622042417526245e+00, 1.622058510780334e+00, 8.763622045516968e-01, 2.116402983665466e-01, 1.863105967640877e-02, 1.36298022698611e-03, 9.015054820338264e-05, 5.586598490481151e-06, 3.313198249088722e-07, 1.462331056245603e-08, -4.58212525700219e-08, -4.93218976771459e-09, 7.490143775939941e-01, 1.323920845985413e+00, 1.535155415534973e+00, 1.598634719848633e+00, 1.616040945053101e+00, 1.62056565284729e+00, 1.621700286865234e+00, 1.621976017951965e+00, 1.622042179107666e+00, 1.622056484222412e+00, 8.762970566749573e-01, 2.093928158283234e-01, 1.863057911396027e-02, 1.36295729316771e-03, 9.018967102747411e-05, 5.518180387298344e-06, 3.093878149229567e-07, 1.969692675629631e-08, 4.965841071680188e-10, 4.534285835688934e-09, 7.453495264053419e-01, 1.324094891548153e+00, 1.535151362419128e+00, 1.598639488220215e+00, 1.616043448448181e+00, 1.620564103126526e+00, 1.621697902679443e+00, 1.621978044509888e+00, 1.622043251991272e+00, 1.622058510780334e+00, 8.762921690940857e-01, 2.096395045518875e-01, 1.863082312047482e-02, 1.363086048513651e-03, 9.01587336556986e-05, 5.58712417841889e-06, 3.298559931863565e-07, 1.920034264912829e-08, 1.098214852390811e-09, 4.592948243953288e-11] -fan2.m_flow=[0e+00, 3.238364160060883e-01, 9.665698409080505e-01, 1.367307186126709e+00, 1.53023374080658e+00, 1.595265626907349e+00, 1.614234685897827e+00, 1.619887828826904e+00, 1.621482372283936e+00, 1.621912360191345e+00, 1.62202525138855e+00, 1.504449725151062e+00, 1.004008531570435e+00, 4.576253592967987e-01, 1.58779069781303e-01, 4.746329411864281e-02, 1.302969083189964e-02, 3.396119689568868e-03, 8.43399204313755e-04, 2.036458172369748e-04, 4.776775676873513e-05, 9.451556950807571e-02, 5.980538725852966e-01, 1.105112195014954e+00, 1.404515147209167e+00, 1.54139244556427e+00, 1.59457004070282e+00, 1.613274931907654e+00, 1.619393944740295e+00, 1.62129819393158e+00, 1.621844530105591e+00, 1.504398107528687e+00, 1.004021048545837e+00, 4.66381847858429e-01, 1.587555855512611e-01, 4.745681211352348e-02, 1.302091125398874e-02, 3.389197867363691e-03, 8.55344464071095e-04, 2.106132305925712e-04, 4.703914964920841e-05, 9.449321031570307e-02, 5.97241222858429e-01, 1.105048894882202e+00, 1.402524948120117e+00, 1.54140293598175e+00, 1.594573616981506e+00, 1.613267779350281e+00, 1.619387626647949e+00, 1.621285915374756e+00, 1.621885776519775e+00, 1.504400610923767e+00, 1.004011988639832e+00, 4.630688428878784e-01, 1.587697267532349e-01, 4.745740443468094e-02, 1.302131731063113e-02, 3.38747282512491e-03, 8.450422319583595e-04, 1.963700487976894e-04, 4.55053523182869e-05, 9.451376646757126e-02, 5.98223865032196e-01, 1.105051755905151e+00, 1.404888272285461e+00, 1.541384816169739e+00, 1.594586253166199e+00, 1.61329448223114e+00, 1.619403958320618e+00, 1.621306180953979e+00, 1.621830463409424e+00, 1.504393696784973e+00, 1.004026770591736e+00, 4.574756622314453e-01, 1.588010787963867e-01, 4.746184498071671e-02, 1.301803253591061e-02, 3.38460342027247e-03, 8.490479085594416e-04, 2.074275689665228e-04, 4.936378536513075e-05, 9.45163071155584e-02, 5.980895161628669e-01, 1.105057597160339e+00, 1.404708504676819e+00, 1.540072917938232e+00, 1.594584941864014e+00, 1.613281488418579e+00, 1.619407534599304e+00, 1.62129271030426e+00, 1.62184727191925e+00, 1.504400014877319e+00, 1.004000067710876e+00, 4.533055126667023e-01, 1.587153524160385e-01, 4.745590314269066e-02, 1.30208944901824e-02, 3.392881713807583e-03, 8.560418500564992e-04, 2.093021903419867e-04, 4.926608016830869e-05] -fan3.m_flow=[0e+00, 5.383297801017761e-01, 1.124705791473389e+00, 1.428618550300598e+00, 1.554775714874268e+00, 1.600537657737732e+00, 1.615597605705261e+00, 1.620223045349121e+00, 1.621562004089355e+00, 1.621930956840515e+00, 1.622029423713684e+00, 1.516015768051147e+00, 1.106585621833801e+00, 6.801723837852478e-01, 3.192040622234337e-01, 9.379150718450546e-02, 2.55405604839325e-02, 6.513927131891232e-03, 1.589839230291545e-03, 3.797657263930887e-04, 8.774844172876328e-05, 1.14462211728096e-01, 7.58853018283844e-01, 1.19597852230072e+00, 1.44085419178009e+00, 1.552851557731628e+00, 1.597818613052368e+00, 1.614128589630127e+00, 1.619606494903564e+00, 1.621341109275818e+00, 1.621854424476624e+00, 1.515962839126587e+00, 1.106562972068787e+00, 6.801590919494629e-01, 3.197629451751694e-01, 9.553485363721848e-02, 2.549540996551514e-02, 6.499024573713541e-03, 1.615358050912619e-03, 3.93242429709062e-04, 8.674356649862602e-05, 1.14452272653578e-01, 7.591243982315063e-01, 1.195974707603455e+00, 1.440623164176941e+00, 1.552858352661133e+00, 1.597821235656738e+00, 1.61412239074707e+00, 1.619601130485535e+00, 1.621333718299866e+00, 1.621858954429626e+00, 1.515962839126587e+00, 1.106560587882996e+00, 6.801605820655823e-01, 3.194526135921478e-01, 9.420029073953629e-02, 2.551787160336942e-02, 6.49541104212413e-03, 1.594017026945949e-03, 3.644828393589705e-04, 8.37457919260487e-05, 1.144639998674393e-01, 7.587964534759521e-01, 1.195972442626953e+00, 1.440652847290039e+00, 1.552847027778625e+00, 1.597827196121216e+00, 1.614140391349792e+00, 1.619610071182251e+00, 1.621334195137024e+00, 1.621846795082092e+00, 1.515959024429321e+00, 1.106562733650208e+00, 6.801615357398987e-01, 3.20422351360321e-01, 9.572827816009521e-02, 2.550799399614334e-02, 6.511997431516647e-03, 1.619197311811149e-03, 4.605636058840901e-04, 9.966395009541884e-05, 1.144630163908061e-01, 7.58838653564448e-01, 1.195973873138428e+00, 1.440539002418518e+00, 1.552058458328247e+00, 1.597827792167664e+00, 1.614132642745972e+00, 1.619617342948914e+00, 1.621342897415161e+00, 1.621858954429626e+00, 1.51596462726593e+00, 1.106569170951843e+00, 6.801608204841614e-01, 3.172318935394287e-01, 9.597036242485046e-02, 2.578061074018478e-02, 6.506970152258873e-03, 1.616829773411155e-03, 3.906660713255405e-04, 9.10558519535698e-05] -fan4.m_flow=[0e+00, 1.28046977519989e+00, 1.5494384765625e+00, 1.606707096099854e+00, 1.618817329406738e+00, 1.621376872062683e+00, 1.621917366981506e+00, 1.622032761573792e+00, 1.622056722640991e+00, 1.622061610221863e+00, 1.622062683105469e+00, 8.762909770011902e-01, 2.096618115901947e-01, 1.863026805222034e-02, 1.363298273645335e-03, 9.01942839846015e-05, 5.623015113087604e-06, 3.633108462963697e-07, -7.016069503151812e-08, -1.35560185299255e-08, -8.429196896031499e-09, 7.456928491592407e-01, 1.324019908905029e+00, 1.535150408744812e+00, 1.598639130592346e+00, 1.616043090820312e+00, 1.62056040763855e+00, 1.621697425842285e+00, 1.621976017951965e+00, 1.622043251991272e+00, 1.622058033943176e+00, 8.763427734375e-01, 2.092804908752441e-01, 1.863043941557407e-02, 1.362975453957902e-03, 9.014781971927732e-05, 5.586143743130378e-06, 3.412487785681151e-07, 2.173692337237298e-08, 2.182787284255028e-10, -1.424723450327292e-08, 7.565706372261003e-01, 1.325553059577942e+00, 1.535158157348633e+00, 1.598642349243164e+00, 1.616046547889709e+00, 1.620560646057129e+00, 1.621695995330811e+00, 1.621975302696228e+00, 1.622042417526245e+00, 1.622058510780334e+00, 8.763622045516968e-01, 2.116403132677078e-01, 1.863105967640877e-02, 1.36298022698611e-03, 9.015054092742503e-05, 5.586598490481151e-06, 3.313198249088722e-07, 1.462331056245603e-08, -4.582216206472367e-08, -4.932644515065476e-09, 7.490143775939941e-01, 1.323920845985413e+00, 1.535155415534973e+00, 1.598634719848633e+00, 1.616040945053101e+00, 1.62056565284729e+00, 1.621700286865234e+00, 1.621976017951965e+00, 1.622042179107666e+00, 1.622056484222412e+00, 8.762970566749573e-01, 2.093928158283234e-01, 1.863057911396027e-02, 1.36295729316771e-03, 9.018967102747411e-05, 5.518180842045695e-06, 3.093878149229567e-07, 1.969738150364719e-08, 4.961293598171324e-10, 4.534285835688934e-09, 7.45349228382118e-01, 1.324094891548153e+00, 1.535151362419128e+00, 1.598639488220215e+00, 1.616043448448181e+00, 1.620564103126526e+00, 1.621697902679443e+00, 1.621978044509888e+00, 1.622043251991272e+00, 1.622058510780334e+00, 8.762921690940857e-01, 2.096348106861115e-01, 1.863082312047482e-02, 1.363086048513651e-03, 9.01587336556986e-05, 5.58712417841889e-06, 3.298555384390056e-07, 1.919943315442652e-08, 1.098214852390811e-09, 4.592948243953288e-11] -fan1.dp=[0e+00, -3.272678833007812e+02, -4.802187805175781e+02, -5.163167114257812e+02, -5.241172485351562e+02, -5.257733154296875e+02, -5.261233520507812e+02, -5.261981201171875e+02, -5.26213623046875e+02, -5.26216796875e+02, -5.262174072265625e+02, -1.534672393798828e+02, -1.835246086120605e+01, -1.58955705165863e+00, -1.162862628698343e-01, -7.696095854043961e-03, -4.776091373059899e-04, -2.838765794876948e-05, -1.570835593156517e-06, -8.454662747681141e-08, -4.20550350099802e-09, -1.113584594726562e+02, -3.507078857421875e+02, -4.714020690917969e+02, -5.111491394042969e+02, -5.223244018554688e+02, -5.252445678710938e+02, -5.259808959960938e+02, -5.261613159179688e+02, -5.262048950195312e+02, -5.262144775390625e+02, -1.534676666259766e+02, -1.835149765014648e+01, -1.589625477790833e+00, -1.162669807672489e-01, -7.689840160310268e-03, -4.76508226711303e-04, -2.823963586706668e-05, -1.633859938010573e-06, -9.19681042432785e-08, -3.885361365973949e-09, -1.114997940063466e+02, -3.507433166503906e+02, -4.714067077636719e+02, -5.111508483886719e+02, -5.2232666015625e+02, -5.252447509765625e+02, -5.259798583984375e+02, -5.261608276367188e+02, -5.26204345703125e+02, -5.262147827148438e+02, -1.534675598144531e+02, -1.835727500915527e+01, -1.589625477790833e+00, -1.162669137120247e-01, -7.690075319260359e-03, -4.765446064993642e-04, -2.819989458657903e-05, -1.582462573423982e-06, -7.60337570682168e-08, -3.798049874603748e-09, -1.114018096923828e+02, -3.507061462402344e+02, -4.714049987792969e+02, -5.11146240234375e+02, -5.223230590820312e+02, -5.252479858398438e+02, -5.25982666015625e+02, -5.261613159179688e+02, -5.262042236328125e+02, -5.262134399414062e+02, -1.534668426513672e+02, -1.835176086425781e+01, -1.589572668075562e+00, -1.162649095058441e-01, -7.691577076911926e-03, -4.758773720823228e-04, -2.810815931297839e-05, -1.603373675607145e-06, -8.87666828930378e-08, -4.816683940589428e-09, -1.113539962768579e+02, -3.5070944213867e+02, -4.714024963378906e+02, -5.111494445800781e+02, -5.223246459960938e+02, -5.252469482421875e+02, -5.25981201171875e+02, -5.2616259765625e+02, -5.262048950195312e+02, -5.262147216796875e+02, -1.534669342041016e+02, -1.835208320617676e+01, -1.589593410491943e+00, -1.162758469581604e-01, -7.690755650401115e-03, -4.765918129123747e-04, -2.831613528542221e-05, -1.636959495954216e-06, -9.064387995749712e-08, -4.700268618762493e-09] -fan2.dp=[0e+00, -2.523567199707031e+01, -1.877875518798828e+02, -3.73989013671875e+02, -4.704352416992188e+02, -5.089842529296875e+02, -5.211537475585938e+02, -5.24808349609375e+02, -5.2584130859375e+02, -5.261200561523438e+02, -5.261932373046875e+02, -4.52580810546875e+02, -2.015322723388672e+02, -4.345972061157227e+01, -1.023900413513181e+01, -2.872166633605957e+00, -7.837437391281128e-01, -2.041839808225626e-01, -5.070822313427925e-02, -1.224369276314974e-02, -2.872132463380694e-03, -5.830621242523193e+00, -7.150765991210938e+01, -2.443009185791016e+02, -3.947117919921875e+02, -4.7520263671875e+02, -5.085400695800781e+02, -5.205352172851562e+02, -5.24488525390625e+02, -5.257190551757812e+02, -5.260750122070312e+02, -4.525497741699219e+02, -2.015373077392578e+02, -4.392600250244141e+01, -1.023830890655512e+01, -2.871766567230225e+00, -7.832157015800476e-01, -2.037684917449951e-01, -5.142413452267647e-02, -1.266224682331085e-02, -2.828175434842706e-03, -5.829172611236492e+00, -7.143440246582031e+01, -2.442913818359375e+02, -3.942944030761719e+02, -4.752092590332031e+02, -5.085420837402344e+02, -5.2052978515625e+02, -5.244842529296875e+02, -5.2571240234375e+02, -5.260872802734375e+02, -4.5255126953125e+02, -2.015336456298828e+02, -4.374811935424805e+01, -1.023881053924561e+01, -2.871803045272827e+00, -7.832401394843969e-01, -2.036648690700561e-01, -5.080479755997658e-02, -1.180617231875658e-02, -2.735846908763051e-03, -5.830503940582275e+00, -7.152130126953125e+01, -2.442898254394531e+02, -3.94791748046875e+02, -4.7519775390625e+02, -5.085507202148438e+02, -5.205467529296875e+02, -5.244925537109375e+02, -5.257174682617188e+02, -5.260673217773438e+02, -4.525471496582031e+02, -2.015395812988281e+02, -4.345449066162109e+01, -1.024015045166016e+01, -2.872074365615845e+00, -7.83044159412384e-01, -2.034932672977448e-01, -5.104557424783707e-02, -1.247074082493782e-02, -2.967461477965117e-03, -5.830668926239264e+00, -7.151084136962777e+01, -2.442920837402344e+02, -3.947524719238281e+02, -4.748961791992188e+02, -5.085497436523438e+02, -5.20538818359375e+02, -5.244979858398438e+02, -5.257185668945312e+02, -5.260779418945312e+02, -4.525509033203125e+02, -2.015289001464844e+02, -4.323332214355469e+01, -1.023678398132324e+01, -2.871711015701294e+00, -7.832146883010864e-01, -2.039900571107864e-01, -5.146608874201775e-02, -1.258343178778887e-02, -2.961928956210613e-03] -fan3.dp=[0e+00, -5.863901138305664e+01, -2.530508880615234e+02, -4.082392272949219e+02, -4.834882202148438e+02, -5.123521728515625e+02, -5.2203369140625e+02, -5.250252685546875e+02, -5.258929443359375e+02, -5.26132080078125e+02, -5.261959228515625e+02, -4.595790100097656e+02, -2.4483642578125e+02, -9.250585174560547e+01, -2.904174995422356e+01, -8.21247673034668e+00, -2.179995059967041e+00, -5.558165907859787e-01, -1.357142478227615e-01, -3.238045424222946e-02, -7.523603271692991e-03, -9.843368530273438e+00, -1.152174911499023e+02, -2.861305541992188e+02, -4.151333312988281e+02, -4.822903747558594e+02, -5.106131286621094e+02, -5.210851440429688e+02, -5.246259765625e+02, -5.257496337890625e+02, -5.260823974609375e+02, -4.595469055175781e+02, -2.448264007568359e+02, -9.2502197265625e+01, -2.903992271423325e+01, -8.210187911987305e+00, -2.178063869476318e+00, -5.545521974563599e-01, -1.378327012062073e-01, -3.355302661657333e-02, -7.39354221150279e-03, -9.842493057250831e+00, -1.152220153808594e+02, -2.861313171386719e+02, -4.151358337402344e+02, -4.822946166992188e+02, -5.106148376464844e+02, -5.210811767578125e+02, -5.2462255859375e+02, -5.25744873046875e+02, -5.260853271484375e+02, -4.595469055175781e+02, -2.448253479003906e+02, -9.250263214111328e+01, -2.904006767272949e+01, -8.21031665802002e+00, -2.178142070770239e+00, -5.542376637458885e-01, -1.360109597444534e-01, -3.110741078853607e-02, -7.1465028449893e-03, -9.843520164489746e+00, -1.152157287597656e+02, -2.861293029785156e+02, -4.151384887695312e+02, -4.8228759765625e+02, -5.1061865234375e+02, -5.210927124023438e+02, -5.246282958984375e+02, -5.257452392578125e+02, -5.260774536132812e+02, -4.595446472167969e+02, -2.448262634277344e+02, -9.250289916992188e+01, -2.904013824462891e+01, -8.210901260375977e+00, -2.177228689193726e+00, -5.536202192306519e-01, -1.367282718420029e-01, -3.301918506622314e-02, -7.783974520862103e-03, -9.843434333801778e+00, -1.152184753417954e+02, -2.861309204101562e+02, -4.151333923339844e+02, -4.822880554199219e+02, -5.106190490722656e+02, -5.210877685546875e+02, -5.246331787109375e+02, -5.257509155273438e+02, -5.2608544921875e+02, -4.595479736328125e+02, -2.448291473388672e+02, -9.250270843505859e+01, -2.904050445556641e+01, -8.210497856140137e+00, -2.178197145462036e+00, -5.55223286151886e-01, -1.37956902384758e-01, -3.333397954702377e-02, -7.769629824906588e-03] -fan4.dp=[0e+00, -3.272669677734375e+02, -4.8021875e+02, -5.163167114257812e+02, -5.241172485351562e+02, -5.257733154296875e+02, -5.261233520507812e+02, -5.261981201171875e+02, -5.26213623046875e+02, -5.26216796875e+02, -5.262174072265625e+02, -1.534672393798828e+02, -1.835246276855469e+01, -1.58955705165863e+00, -1.162862628698343e-01, -7.696095854043961e-03, -4.776091373059899e-04, -2.838765794876948e-05, -1.570835593156517e-06, -8.454662747681141e-08, -4.20550350099802e-09, -1.113584671020508e+02, -3.507078857421875e+02, -4.714020690917969e+02, -5.111491394042969e+02, -5.223244018554688e+02, -5.252445678710938e+02, -5.259808959960938e+02, -5.261613159179688e+02, -5.262048950195312e+02, -5.262144775390625e+02, -1.534676666259766e+02, -1.835149955749512e+01, -1.589625477790833e+00, -1.162669807672489e-01, -7.689840160310268e-03, -4.76508226711303e-04, -2.823963586706668e-05, -1.633859938010573e-06, -9.19681042432785e-08, -3.885361365973949e-09, -1.11499786376952e+02, -3.507433166503906e+02, -4.714067077636719e+02, -5.111508483886719e+02, -5.2232666015625e+02, -5.252447509765625e+02, -5.259798583984375e+02, -5.261608276367188e+02, -5.26204345703125e+02, -5.262147827148438e+02, -1.534675598144531e+02, -1.835727500915527e+01, -1.589625477790833e+00, -1.162669137120247e-01, -7.690075319260359e-03, -4.765446064993642e-04, -2.819989458657903e-05, -1.582462573423982e-06, -7.60337570682168e-08, -3.798049874603748e-09, -1.114018096923828e+02, -3.507061462402344e+02, -4.714049987792969e+02, -5.11146240234375e+02, -5.223230590820312e+02, -5.252479858398438e+02, -5.25982666015625e+02, -5.261613159179688e+02, -5.262042236328125e+02, -5.262134399414062e+02, -1.534668426513672e+02, -1.835176086425781e+01, -1.589572668075562e+00, -1.162649095058441e-01, -7.691577076911926e-03, -4.758773720823228e-04, -2.810815931297839e-05, -1.603373675607145e-06, -8.87666828930378e-08, -4.816683940589428e-09, -1.113539886474634e+02, -3.5070944213867e+02, -4.714024963378906e+02, -5.111494445800781e+02, -5.223246459960938e+02, -5.252469482421875e+02, -5.25981201171875e+02, -5.2616259765625e+02, -5.262048950195312e+02, -5.262147216796875e+02, -1.534669342041016e+02, -1.835207176208496e+01, -1.589593410491943e+00, -1.162758469581604e-01, -7.690755650401115e-03, -4.765918129123747e-04, -2.831613528542221e-05, -1.636959495954216e-06, -9.064387995749712e-08, -4.700268618762493e-09] diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_ControlledFlowMachine.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_ControlledFlowMachine.txt deleted file mode 100644 index d2aa13bbc9..0000000000 --- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_ControlledFlowMachine.txt +++ /dev/null @@ -1,22 +0,0 @@ -last-generated=2021-06-17 -statistics-initialization= -{ - "nonlinear": "1, 1, 0, 1, 1", - "numerical Jacobians": "0" -} -statistics-simulation= -{ - "linear": " ", - "nonlinear": "1, 1, 0, 1, 1", - "number of continuous time states": "14", - "numerical Jacobians": "0" -} -time=[0e+00, 6e+02] -fan1.m_flow=[0e+00, 3.501554718241096e-03, 4.24210075289011e-03, 4.398650955408812e-03, 4.431774839758873e-03, 4.438804462552071e-03, 4.440273623913527e-03, 4.440587013959885e-03, 4.44067595526576e-03, 4.440652672201395e-03, 4.440652672201395e-03, 2.397827338427305e-03, 6.946366629563272e-04, 9.096522990148515e-05, 6.965171451156459e-06, 4.73568888992304e-07, 3.211198418284766e-08, 2.439173840684844e-08, 3.014065441675484e-09, -1.355147105641663e-10, 2.678780219866894e-08, 2.042373875156045e-03, 3.625104203820229e-03, 4.202964249998331e-03, 4.376594442874193e-03, 4.424185026437044e-03, 4.436537623405457e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440613556653261e-03, 2.397601725533605e-03, 6.946418434381485e-04, 9.100652096094564e-05, 6.934275006642497e-06, 4.693797563959379e-07, 3.242530510760844e-08, 8.574261300964281e-09, 5.601123120868579e-09, 5.618448994937353e-08, 1.968601281987503e-07, 2.042373176664103e-03, 3.625105135142803e-03, 4.202964715659618e-03, 4.376594442874193e-03, 4.424185026437044e-03, 4.436537623405457e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440613556653261e-03, 2.397601725533605e-03, 6.946418434381485e-04, 9.100651368498802e-05, 6.934275916137267e-06, 4.693797563959379e-07, 3.242530510760782e-08, 8.574261300964013e-09, 5.600668373517692e-09, 5.618130671791732e-08, 1.968596734513994e-07, 2.04237992875278e-03, 3.625104669481516e-03, 4.202964715659618e-03, 4.376594442874193e-03, 4.424185492098331e-03, 4.436537623405457e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440614022314548e-03, 2.397601725533605e-03, 6.946418434381485e-04, 9.100652096094564e-05, 6.934275916137267e-06, 4.693797563959379e-07, 3.242530510760844e-08, 8.574716048315167e-09, 5.600668373517692e-09, 5.618130671791732e-08, 1.968587639566977e-07, 2.042379230260869e-03, 3.625104669481506e-03, 4.202964715659618e-03, 4.376594442874193e-03, 4.424185492098331e-03, 4.436537623405457e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440614022314548e-03, 2.397601725533605e-03, 6.946418434381485e-04, 9.100652096094564e-05, 6.934275916137267e-06, 4.693811206379905e-07, 3.242530510760844e-08, 8.574261300964281e-09, 5.600668373517692e-09, 5.618130671791732e-08, 1.968583092093468e-07] -fan2.m_flow=[0e+00, 3.501401515677571e-03, 4.242068622261286e-03, 4.398644436150789e-03, 4.431773442775011e-03, 4.438804462552071e-03, 4.440273623913527e-03, 4.440587013959885e-03, 4.44067595526576e-03, 4.440652672201395e-03, 4.440652672201395e-03, 2.398065524175763e-03, 6.94753834977746e-04, 9.098674490815029e-05, 6.96846063874542e-06, 4.737257768283598e-07, 3.212107912986539e-08, 2.437445800751475e-08, 3.020886651938781e-09, -1.095941115636379e-10, 2.68664734903723e-08, 2.04212311655283e-03, 3.62500362098217e-03, 4.202932585030794e-03, 4.376585595309734e-03, 4.424182698130608e-03, 4.436536692082882e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440613556653261e-03, 2.397839911282063e-03, 6.947556976228952e-04, 9.102960029849783e-05, 6.936554655112491e-06, 4.694566086982377e-07, 3.243485480197705e-08, 8.579718269174919e-09, 5.537003744393587e-09, 5.56815393792931e-08, 1.967900971067138e-07, 2.042122185230244e-03, 3.625004552304745e-03, 4.202932585030794e-03, 4.376585595309734e-03, 4.424182698130608e-03, 4.436536692082882e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440613556653261e-03, 2.397839911282063e-03, 6.947556976228952e-04, 9.102960029849783e-05, 6.936556928849313e-06, 4.694566086982377e-07, 3.243485480197644e-08, 8.579718269174652e-09, 5.537003744393587e-09, 5.568290362134576e-08, 1.967900971067138e-07, 2.042128937318921e-03, 3.625003853812814e-03, 4.202932585030794e-03, 4.376585595309734e-03, 4.424182698130608e-03, 4.436536692082882e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573044121265e-03, 4.440614022314548e-03, 2.397839911282063e-03, 6.947556976228952e-04, 9.102960029849783e-05, 6.936556474101963e-06, 4.694556992035359e-07, 3.243485480197705e-08, 8.580627763876691e-09, 5.537003744393587e-09, 5.568199412664399e-08, 1.967896423593629e-07, 2.042128238827011e-03, 3.625003853812804e-03, 4.202932585030794e-03, 4.376585595309734e-03, 4.424182698130608e-03, 4.436536692082882e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440614022314548e-03, 2.397839911282063e-03, 6.947556976228952e-04, 9.102960029849783e-05, 6.936555564607261e-06, 4.694561539508868e-07, 3.243485480197705e-08, 8.579263521824032e-09, 5.536094249691814e-09, 5.56815393792931e-08, 1.967900971067138e-07] -fan3.m_flow=[0e+00, 3.501401515677571e-03, 4.242068622261286e-03, 4.398644436150789e-03, 4.431773442775011e-03, 4.438804462552071e-03, 4.440273623913527e-03, 4.440587013959885e-03, 4.44067595526576e-03, 4.440652672201395e-03, 4.440652672201395e-03, 2.398065524175763e-03, 6.94753834977746e-04, 9.098674490815029e-05, 6.968459729250719e-06, 4.737257768283598e-07, 3.212107912986539e-08, 2.437400326016387e-08, 3.020431904587895e-09, -1.086846168618649e-10, 2.68664734903723e-08, 2.04212311655283e-03, 3.62500362098217e-03, 4.202932585030794e-03, 4.376585595309734e-03, 4.424182698130608e-03, 4.436536692082882e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440613556653261e-03, 2.397839911282063e-03, 6.947556394152343e-04, 9.102959302254021e-05, 6.93655420036514e-06, 4.694566086982377e-07, 3.243485480197705e-08, 8.579718269174919e-09, 5.537003744393587e-09, 5.568381311604753e-08, 1.967905518540647e-07, 2.042122418060888e-03, 3.625004552304745e-03, 4.202932585030794e-03, 4.376585595309734e-03, 4.424182698130608e-03, 4.436536692082882e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440613556653261e-03, 2.397839911282063e-03, 6.947556394152343e-04, 9.102960029849783e-05, 6.936556019354612e-06, 4.694556992035359e-07, 3.243440005462555e-08, 8.580173016525539e-09, 5.536094249691814e-09, 5.567926564253867e-08, 1.96789187612012e-07, 2.042128937318921e-03, 3.625003853812814e-03, 4.202932585030794e-03, 4.376585595309734e-03, 4.424182698130608e-03, 4.436536692082882e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573044121265e-03, 4.440614022314548e-03, 2.397839911282063e-03, 6.947556976228952e-04, 9.102960029849783e-05, 6.936556019354612e-06, 4.694556992035359e-07, 3.243440005462617e-08, 8.579718269174919e-09, 5.537003744393587e-09, 5.568062988459133e-08, 1.967900971067138e-07, 2.042128238827011e-03, 3.625003853812804e-03, 4.202932585030794e-03, 4.376585595309734e-03, 4.424182698130608e-03, 4.436536692082882e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440614022314548e-03, 2.397839911282063e-03, 6.947556976228952e-04, 9.102960029849783e-05, 6.936556474101963e-06, 4.694566086982377e-07, 3.243485480197705e-08, 8.579718269174919e-09, 5.537003744393587e-09, 5.568199412664399e-08, 1.967900971067138e-07] -fan4.m_flow=[0e+00, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.547473508864641e-13, 0e+00, 0e+00, 0e+00, 4.547473508864641e-13, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 0e+00, -1.364242052659392e-12, 0e+00, 0e+00, -9.094947017729282e-13, 0e+00, 0e+00, 0e+00, -3.637978807091713e-12, 0e+00, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 0e+00, -1.364242052659392e-12, 0e+00, 0e+00, 0e+00, -9.094947017728851e-13, 0e+00, 0e+00, 1.364242052659392e-12, 4.547473508864641e-13, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.547473508864641e-13, 0e+00, 0e+00, -9.094947017729282e-13, 0e+00, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 0e+00, 4.547473508864641e-13, 0e+00, 0e+00, 0e+00, -9.094947017729282e-13, 0e+00, 0e+00, -1.364242052659392e-12, -9.094947017729282e-13] -fan1.dp=[0e+00, -1.703012109375e+04, -2.4994837890625e+04, -2.6873333984375e+04, -2.727879296875e+04, -2.7365400390625e+04, -2.738351953125e+04, -2.7387380859375e+04, -2.738848046875e+04, -2.738819140625e+04, -2.738819140625e+04, -7.98559619140625e+03, -1.274951049804688e+03, -1.618009185791016e+02, -1.228352355957025e+01, -8.147192597389221e-01, -5.057528614997864e-02, -3.044552169740184e-03, -1.794220152078196e-04, -1.349870581179857e-05, -1.448250259272754e-06, -5.7942861328125e+03, -1.8251892578125e+04, -2.453478515625e+04, -2.660372265625e+04, -2.7185439453125e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -1.274929321289062e+03, -1.618170166015625e+02, -1.228036117553699e+01, -8.144035935401917e-01, -5.057092010974884e-02, -3.04812379181385e-03, -1.782526087481529e-04, -1.708813942968845e-05, -4.110363079234958e-06, -5.794309082031195e+03, -1.8251904296875e+04, -2.4534787109375e+04, -2.6603724609375e+04, -2.7185439453125e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -1.274929321289062e+03, -1.618170166015625e+02, -1.228036117553711e+01, -8.144035935401917e-01, -5.057092010974781e-02, -3.048124024644602e-03, -1.782525796443224e-04, -1.708815398160368e-05, -4.110319423489273e-06, -5.79430810546875e+03, -1.825190234375e+04, -2.4534787109375e+04, -2.6603724609375e+04, -2.718544140625e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -1.274929321289062e+03, -1.618170166015625e+02, -1.228036117553711e+01, -8.144035935401917e-01, -5.057092010974884e-02, -3.048124024644494e-03, -1.782525796443224e-04, -1.708815398160368e-05, -4.110319423489273e-06, -5.794308593750126e+03, -1.82519023437499e+04, -2.4534787109375e+04, -2.6603724609375e+04, -2.718544140625e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -1.274929321289062e+03, -1.618170166015625e+02, -1.228036117553711e+01, -8.144035935401917e-01, -5.057092010974884e-02, -3.048124024644494e-03, -1.782525796443224e-04, -1.708816853351891e-05, -4.110319423489273e-06] -fan2.dp=[0e+00, -1.703012109375e+04, -2.4994837890625e+04, -2.6873333984375e+04, -2.727879296875e+04, -2.7365400390625e+04, -2.738351953125e+04, -2.7387380859375e+04, -2.738848046875e+04, -2.738819140625e+04, -2.738819140625e+04, -7.98559619140625e+03, -8.403944702148438e+02, -8.571736907958984e+01, -6.477916240692107e+00, -4.296443462371826e-01, -2.667104639112949e-02, -1.605893950909368e-03, -9.466288611292839e-05, -7.117239874787629e-06, -1.171414623968303e-06, -5.7942861328125e+03, -1.8251892578125e+04, -2.453478515625e+04, -2.660372265625e+04, -2.7185439453125e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -8.403751831054688e+02, -8.572597503662109e+01, -6.47624826431268e+00, -4.294778108596802e-01, -2.666874974966049e-02, -1.607538899406791e-03, -9.408306505065411e-05, -9.845010936260223e-06, -5.142836016602814e-06, -5.794309082031193e+03, -1.8251904296875e+04, -2.4534787109375e+04, -2.6603724609375e+04, -2.7185439453125e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -8.403751831054688e+02, -8.572597503662109e+01, -6.476248264312744e+00, -4.294778108596802e-01, -2.666874974965995e-02, -1.60753901582217e-03, -9.408305049873888e-05, -9.84512735158205e-06, -5.142836016602814e-06, -5.79430810546875e+03, -1.825190234375e+04, -2.4534787109375e+04, -2.6603724609375e+04, -2.718544140625e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -8.403751831054688e+02, -8.572597503662109e+01, -6.476248264312744e+00, -4.294778108596802e-01, -2.666874974966049e-02, -1.607539015822113e-03, -9.408306505065411e-05, -9.845098247751594e-06, -5.142821464687586e-06, -5.794308593750126e+03, -1.82519023437499e+04, -2.4534787109375e+04, -2.6603724609375e+04, -2.718544140625e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -8.403751831054688e+02, -8.572597503662109e+01, -6.476248264312744e+00, -4.294778108596802e-01, -2.666874974966049e-02, -1.607538899406791e-03, -9.408303594682366e-05, -9.845083695836365e-06, -5.142850568518043e-06] -fan3.dp=[0e+00, -1.703012109375e+04, -2.4994837890625e+04, -2.6873333984375e+04, -2.727879296875e+04, -2.7365400390625e+04, -2.738351953125e+04, -2.7387380859375e+04, -2.738848046875e+04, -2.738819140625e+04, -2.738819140625e+04, -7.98559619140625e+03, -1.274951049804688e+03, -1.618009185791016e+02, -1.228352355957025e+01, -8.147192597389221e-01, -5.057528614997864e-02, -3.044552169740184e-03, -1.794220152078196e-04, -1.349870581179857e-05, -1.448250259272754e-06, -5.7942861328125e+03, -1.8251892578125e+04, -2.453478515625e+04, -2.660372265625e+04, -2.7185439453125e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -1.274929321289062e+03, -1.618170166015625e+02, -1.228036117553699e+01, -8.144035935401917e-01, -5.057092010974884e-02, -3.04812379181385e-03, -1.782526087481529e-04, -1.708813942968845e-05, -4.110363079234958e-06, -5.794309082031195e+03, -1.8251904296875e+04, -2.4534787109375e+04, -2.6603724609375e+04, -2.7185439453125e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -1.274929321289062e+03, -1.618170166015625e+02, -1.228036117553711e+01, -8.144035935401917e-01, -5.057092010974781e-02, -3.048124024644602e-03, -1.782525796443224e-04, -1.708815398160368e-05, -4.110319423489273e-06, -5.79430810546875e+03, -1.825190234375e+04, -2.4534787109375e+04, -2.6603724609375e+04, -2.718544140625e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -1.274929321289062e+03, -1.618170166015625e+02, -1.228036117553711e+01, -8.144035935401917e-01, -5.057092010974884e-02, -3.048124024644494e-03, -1.782525796443224e-04, -1.708815398160368e-05, -4.110319423489273e-06, -5.794308593750126e+03, -1.82519023437499e+04, -2.4534787109375e+04, -2.6603724609375e+04, -2.718544140625e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -1.274929321289062e+03, -1.618170166015625e+02, -1.228036117553711e+01, -8.144035935401917e-01, -5.057092010974884e-02, -3.048124024644494e-03, -1.782525796443224e-04, -1.708816853351891e-05, -4.110319423489273e-06] -fan4.dp=[-2.7388189453125e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt deleted file mode 100644 index fc312ab487..0000000000 --- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt +++ /dev/null @@ -1,22 +0,0 @@ -last-generated=2021-06-17 -statistics-initialization= -{ - "nonlinear": "1, 1, 0, 1, 1", - "numerical Jacobians": "0" -} -statistics-simulation= -{ - "linear": " ", - "nonlinear": "1, 1, 0, 1, 1", - "number of continuous time states": "20", - "numerical Jacobians": "0" -} -time=[0e+00, 6e+02] -fan1.m_flow=[0e+00, 3.501605708152056e-03, 4.242090508341789e-03, 4.398665856570005e-03, 4.431773908436298e-03, 4.438775591552258e-03, 4.440256860107183e-03, 4.440570715814829e-03, 4.440637305378914e-03, 4.44065174087882e-03, 4.440654534846544e-03, 2.397751668468118e-03, 6.946114008314908e-04, 9.096450230572373e-05, 6.906901944603271e-06, 4.597268343786709e-07, 2.871729520848021e-08, 1.793523551896206e-09, 9.868017514236271e-11, 5.002220859751105e-12, 4.547473508864641e-13, 2.042543608695269e-03, 3.62505903467536e-03, 4.20296797528863e-03, 4.376600496470928e-03, 4.424193408340216e-03, 4.436556715518236e-03, 4.439655691385269e-03, 4.440415650606155e-03, 4.440598655492067e-03, 4.4406414963305e-03, 2.397749107331038e-03, 6.946109933778644e-04, 9.096309804590419e-05, 6.906884664203904e-06, 4.581775101542007e-07, 2.864499037968926e-08, 1.757598511176184e-09, 9.640643838793039e-11, 5.911715561524034e-12, 4.547473508864641e-13, 2.042540814727534e-03, 3.625059733167291e-03, 4.202965646982193e-03, 4.376601427793503e-03, 4.424192477017641e-03, 4.436556249856949e-03, 4.439655225723982e-03, 4.440415184944868e-03, 4.440598655492067e-03, 4.440641961991787e-03, 2.397749340161681e-03, 6.946110515855253e-04, 9.09631053218618e-05, 6.906884664203972e-06, 4.581775101542007e-07, 2.864408088498691e-08, 1.757598511176246e-09, 9.731593308970332e-11, 6.366462912410498e-12, 4.547473508864641e-13, 2.042529406026006e-03, 3.625063691288233e-03, 4.202965646982193e-03, 4.376601427793503e-03, 4.42419433966279e-03, 4.436557646840811e-03, 4.439658019691706e-03, 4.440417047590017e-03, 4.440599121153355e-03, 4.440642427653074e-03, 2.397749572992325e-03, 6.946110515855253e-04, 9.09631053218618e-05, 6.906885573698673e-06, 4.581775101542007e-07, 2.864499037968926e-08, 1.758508005877957e-09, 9.595169103704393e-11, 5.002220859751105e-12, 4.547473508864641e-13, 2.042529173195382e-03, 3.625062759965648e-03, 4.202965646982193e-03, 4.376600962132215e-03, 4.424190614372492e-03, 4.436555318534374e-03, 4.439657554030418e-03, 4.44041658192873e-03, 4.440599121153355e-03, 4.440642427653074e-03, 2.397749572992325e-03, 6.946110515855253e-04, 9.09631053218618e-05, 6.906885573698673e-06, 4.581779649015516e-07, 2.864544512704015e-08, 1.757598511176184e-09, 9.640643838793039e-11, 5.002220859751105e-12, 4.547473508864641e-13] -fan2.m_flow=[0e+00, 8.949422626756132e-04, 2.65989825129509e-03, 3.74473980627954e-03, 4.204541444778442e-03, 4.367383196949959e-03, 4.419260192662477e-03, 4.434677306562662e-03, 4.439040087163448e-03, 4.440230317413807e-03, 4.440546035766602e-03, 4.118424374610186e-03, 2.755261026322842e-03, 1.314262044616044e-03, 4.79495764011516e-04, 1.478799385949969e-04, 4.13616253354121e-05, 1.089719989977308e-05, 2.760303686955012e-06, 6.805807970522437e-07, 1.645253178139683e-07, 2.817388158291578e-04, 1.649767975322902e-03, 3.029945539310575e-03, 3.847505198791623e-03, 4.220185335725546e-03, 4.365534987300634e-03, 4.416648298501968e-03, 4.433348309248686e-03, 4.438514821231365e-03, 4.440039396286011e-03, 4.11828001961112e-03, 2.755221212282777e-03, 1.314251101575792e-03, 4.794951237272448e-04, 1.478827762184665e-04, 4.136259667575359e-05, 1.089728357328568e-05, 2.760236839094432e-06, 6.80599896440981e-07, 1.64478478836827e-07, 2.817427739500964e-04, 1.649768673814833e-03, 3.029946470633149e-03, 3.847502404823899e-03, 4.220187664031982e-03, 4.365534987300634e-03, 4.416648764163256e-03, 4.433346446603537e-03, 4.438513424247503e-03, 4.440045915544033e-03, 4.118282347917557e-03, 2.755221910774708e-03, 1.314251334406435e-03, 4.79495181934908e-04, 1.478828053222969e-04, 4.136260395171075e-05, 1.089728539227524e-05, 2.760237293841783e-06, 6.806008059356827e-07, 1.64478478836827e-07, 2.817578497342765e-04, 1.649771351367235e-03, 3.029948333278298e-03, 3.847502637654543e-03, 4.220183938741684e-03, 4.365534521639347e-03, 4.41665155813098e-03, 4.433353431522846e-03, 4.438521340489388e-03, 4.44005336612463e-03, 4.118285141885281e-03, 2.755222842097282e-03, 1.314251683652401e-03, 4.794952692463994e-04, 1.478828198742121e-04, 4.136260758969001e-05, 1.089728630176978e-05, 2.760236839094432e-06, 6.806008059356827e-07, 1.64478478836827e-07, 2.817578206304559e-04, 1.649774610996232e-03, 3.029948798939586e-03, 3.847504733130336e-03, 4.220192786306143e-03, 4.365536384284496e-03, 4.416650161147118e-03, 4.433352034538984e-03, 4.438518080860376e-03, 4.440049175173044e-03, 4.118283744901419e-03, 2.755222376435995e-03, 1.314251567237079e-03, 4.794952401425689e-04, 1.478828053222969e-04, 4.136260395171121e-05, 1.089728539227508e-05, 2.760237293841783e-06, 6.806008059356827e-07, 1.64478478836827e-07] -fan3.m_flow=[0e+00, 1.450155745260417e-03, 3.080698428675532e-03, 3.911586478352547e-03, 4.25664009526372e-03, 4.381790291517973e-03, 4.422961268573999e-03, 4.435586743056774e-03, 4.439257550984621e-03, 4.440281074494123e-03, 4.440558608621359e-03, 4.14996175095439e-03, 3.034239402040839e-03, 1.893000560812652e-03, 8.640975574962774e-04, 2.621321473270655e-04, 7.091530278557912e-05, 1.824597347876983e-05, 4.546242053038441e-06, 1.10757628135616e-06, 2.653250703588128e-07, 3.240198420826346e-04, 2.085372572764754e-03, 3.275953233242035e-03, 3.944502212107182e-03, 4.251319915056229e-03, 4.374356009066105e-03, 4.418967757374048e-03, 4.433930851519108e-03, 4.438656847923994e-03, 4.440073855221272e-03, 4.149814136326313e-03, 3.034184454008937e-03, 1.892974833026528e-03, 8.640866726636846e-04, 2.621267340146005e-04, 7.091510633472353e-05, 1.824564242269844e-05, 4.54595419796533e-06, 1.107565367419738e-06, 2.652291186677758e-07, 3.240197838749693e-04, 2.087092027068138e-03, 3.275977913290262e-03, 3.944502212107182e-03, 4.251324106007814e-03, 4.37435694038868e-03, 4.418968688696623e-03, 4.433928988873959e-03, 4.438655450940132e-03, 4.440079908818007e-03, 4.149815998971462e-03, 3.034185385331511e-03, 1.892975182272494e-03, 8.640870219096541e-04, 2.621268213260919e-04, 7.091512816259559e-05, 1.824564787966692e-05, 4.545955562207382e-06, 1.107564912672387e-06, 2.652291186677758e-07, 3.240121877752244e-04, 2.086082473397255e-03, 3.275980474427342e-03, 3.944501746445894e-03, 4.251320846378803e-03, 4.374354612082243e-03, 4.418967291712761e-03, 4.433933645486832e-03, 4.438662435859442e-03, 4.440086893737316e-03, 4.149818327277899e-03, 3.03418654948473e-03, 1.892975764349103e-03, 8.640873129479587e-04, 2.621269086375833e-04, 7.091514999046922e-05, 1.824565333663486e-05, 4.545956471702084e-06, 1.107564912672387e-06, 2.652291186677758e-07, 3.240103833377504e-04, 2.085328334942446e-03, 3.275912255048752e-03, 3.944504540413618e-03, 4.251478239893913e-03, 4.374353215098381e-03, 4.418969620019197e-03, 4.433930851519108e-03, 4.438659641891718e-03, 4.440083168447018e-03, 4.149817395955324e-03, 3.034185850992799e-03, 1.892975531518459e-03, 8.64087138324976e-04, 2.621268504299223e-04, 7.09151427145116e-05, 1.824565151764546e-05, 4.545955562207382e-06, 1.107565822167089e-06, 2.652291186677758e-07] -fan4.m_flow=[0e+00, 3.501605708152056e-03, 4.242090508341789e-03, 4.398665856570005e-03, 4.431773908436298e-03, 4.438775591552258e-03, 4.440256860107183e-03, 4.440570715814829e-03, 4.440637305378914e-03, 4.44065174087882e-03, 4.440654534846544e-03, 2.397751668468118e-03, 6.946114008314908e-04, 9.096450230572373e-05, 6.906902399350622e-06, 4.597268343786709e-07, 2.87177499558311e-08, 1.792614057194433e-09, 9.777068044058979e-11, 5.911715561524034e-12, 4.547473508864641e-13, 2.042543608695269e-03, 3.62505903467536e-03, 4.20296797528863e-03, 4.376600496470928e-03, 4.424193408340216e-03, 4.436556715518236e-03, 4.439655691385269e-03, 4.440415650606155e-03, 4.440598655492067e-03, 4.4406414963305e-03, 2.397749107331038e-03, 6.946109933778644e-04, 9.096309804590419e-05, 6.906885573698606e-06, 4.581779649015516e-07, 2.86436261376366e-08, 1.758508005877957e-09, 9.731593308970332e-11, 5.911715561524034e-12, 4.547473508864641e-13, 2.042540814727534e-03, 3.625059733167291e-03, 4.202965646982193e-03, 4.376601427793503e-03, 4.424192477017641e-03, 4.436556249856949e-03, 4.439655225723982e-03, 4.440415184944868e-03, 4.440598655492067e-03, 4.440641961991787e-03, 2.397749340161681e-03, 6.946110515855253e-04, 9.09631053218618e-05, 6.906884664203972e-06, 4.581770554068498e-07, 2.864408088498691e-08, 1.758508005878018e-09, 9.731593308970332e-11, 5.002220859751105e-12, 4.547473508864641e-13, 2.042529406026006e-03, 3.625063691288233e-03, 4.202965646982193e-03, 4.376601427793503e-03, 4.42419433966279e-03, 4.436557646840811e-03, 4.439658019691706e-03, 4.440417047590017e-03, 4.440599121153355e-03, 4.440642427653074e-03, 2.397749572992325e-03, 6.946110515855253e-04, 9.09631053218618e-05, 6.906886028446024e-06, 4.581775101542007e-07, 2.86436261376366e-08, 1.757598511176184e-09, 9.640643838793039e-11, 5.002220859751105e-12, 4.547473508864641e-13, 2.042529173195382e-03, 3.625062759965648e-03, 4.202965646982193e-03, 4.376600962132215e-03, 4.424190614372492e-03, 4.436555318534374e-03, 4.439657554030418e-03, 4.44041658192873e-03, 4.440599121153355e-03, 4.440642427653074e-03, 2.397749572992325e-03, 6.946110515855253e-04, 9.09631053218618e-05, 6.906885573698673e-06, 4.581775101542007e-07, 2.86436261376366e-08, 1.757598511176184e-09, 9.731593308970332e-11, 5.911715561524034e-12, 0e+00] -fan1.dp=[0e+00, -1.7029619140625e+04, -2.499365234375e+04, -2.6872728515625e+04, -2.7278783203125e+04, -2.7365044921875e+04, -2.738330859375e+04, -2.738718359375e+04, -2.7388005859375e+04, -2.73881796875e+04, -2.7388216796875e+04, -7.98509130859375e+03, -1.274897583007812e+03, -1.618067779541016e+02, -1.227907276153558e+01, -8.134369254112244e-01, -5.04227913916111e-02, -2.984987571835503e-03, -1.70716259162873e-04, -9.519848390482366e-06, -5.200854502618313e-07, -5.79449072265625e+03, -1.825158203125e+04, -2.4534767578125e+04, -2.6603796875e+04, -2.7185541015625e+04, -2.733769140625e+04, -2.737589453125e+04, -2.738526953125e+04, -2.7387525390625e+04, -2.738805078125e+04, -7.9850751953125e+03, -1.274897338867188e+03, -1.618069305419922e+02, -1.227913665771472e+01, -8.134126663208008e-01, -5.041937157511711e-02, -2.984585706144571e-03, -1.706803595880046e-04, -9.518960723653436e-06, -5.195761332288384e-07, -5.794474609374945e+03, -1.82515859375e+04, -2.45347421875e+04, -2.66038046875e+04, -2.7185529296875e+04, -2.73376875e+04, -2.7375888671875e+04, -2.7385263671875e+04, -2.73875234375e+04, -2.7388060546875e+04, -7.985076171875e+03, -1.274897338867188e+03, -1.618069458007812e+02, -1.227913665771484e+01, -8.134127259254456e-01, -5.041937157511608e-02, -2.98458570614468e-03, -1.706803450360894e-04, -9.518960723653436e-06, -5.195761332288384e-07, -5.79441015625e+03, -1.825162890625e+04, -2.453474609375e+04, -2.660380859375e+04, -2.718555078125e+04, -2.7337705078125e+04, -2.737592578125e+04, -2.7385283203125e+04, -2.7387533203125e+04, -2.738806640625e+04, -7.9850771484375e+03, -1.2748974609375e+03, -1.618069610595703e+02, -1.227913761138916e+01, -8.134127855300903e-01, -5.041937530040741e-02, -2.984585938975215e-03, -1.706803595880046e-04, -9.518960723653436e-06, -5.195761332288384e-07, -5.794408691406376e+03, -1.82516171874999e+04, -2.453474609375e+04, -2.6603802734375e+04, -2.71855078125e+04, -2.7337673828125e+04, -2.7375916015625e+04, -2.738528125e+04, -2.738753125e+04, -2.7388064453125e+04, -7.9850771484375e+03, -1.2748974609375e+03, -1.618069458007812e+02, -1.227913761138916e+01, -8.134127259254456e-01, -5.041937530040741e-02, -2.984585706144571e-03, -1.706803595880046e-04, -9.518960723653436e-06, -5.195761332288384e-07] -fan2.dp=[0e+00, -1.2371650390625e+03, -9.8277197265625e+03, -1.947739453125e+04, -2.4553474609375e+04, -2.6491970703125e+04, -2.7124982421875e+04, -2.731454296875e+04, -2.73683046875e+04, -2.7382982421875e+04, -2.7386875e+04, -2.355655859375e+04, -1.054250390625e+04, -2.428723876953125e+03, -5.12512329101561e+02, -1.404928131103516e+02, -3.881343460083008e+01, -1.02157640457153e+01, -2.587506532669067e+00, -6.379718780517578e-01, -1.542248576879501e-01, -2.771304626464844e+02, -3.78216455078125e+03, -1.27518720703125e+04, -2.0560880859375e+04, -2.47364765625e+04, -2.6469544921875e+04, -2.7092931640625e+04, -2.72981796875e+04, -2.736183203125e+04, -2.7380630859375e+04, -2.3554912109375e+04, -1.054219921875e+04, -2.428685546875e+03, -5.125114746093722e+02, -1.404955749511719e+02, -3.881435012817383e+01, -1.021584224700928e+01, -2.587444305419922e+00, -6.379900574684143e-01, -1.541806310415268e-01, -2.771347045898401e+02, -3.782167724609375e+03, -1.27518798828125e+04, -2.05608515625e+04, -2.47365078125e+04, -2.6469548828125e+04, -2.709293359375e+04, -2.7298154296875e+04, -2.73618125e+04, -2.738070703125e+04, -2.35549375e+04, -1.0542205078125e+04, -2.4286865234375e+03, -5.125115356445312e+02, -1.4049560546875e+02, -3.881435394287067e+01, -1.021584415435806e+01, -2.587444543838501e+00, -6.379901170730591e-01, -1.541807055473328e-01, -2.7715087890625e+02, -3.7821796875e+03, -1.27518955078125e+04, -2.0560853515625e+04, -2.47364609375e+04, -2.64695390625e+04, -2.709296875e+04, -2.7298240234375e+04, -2.7361912109375e+04, -2.7380802734375e+04, -2.355496875e+04, -1.05422109375e+04, -2.4286875e+03, -5.125116577148438e+02, -1.404956207275391e+02, -3.881435775756836e+01, -1.021584510803223e+01, -2.58744478225708e+00, -6.379901766777039e-01, -1.541806608438492e-01, -2.771508483886837e+02, -3.78219433593744e+03, -1.27519013671875e+04, -2.0560876953125e+04, -2.473656640625e+04, -2.64695625e+04, -2.7092953125e+04, -2.7298224609375e+04, -2.736187109375e+04, -2.738075e+04, -2.3554953125e+04, -1.05422080078125e+04, -2.42868701171875e+03, -5.125115966796875e+02, -1.4049560546875e+02, -3.881435775756836e+01, -1.021584415435791e+01, -2.587444543838501e+00, -6.379901170730591e-01, -1.54180645942688e-01] -fan3.dp=[0e+00, -3.081052001953125e+03, -1.3182890625e+04, -2.1251384765625e+04, -2.5165314453125e+04, -2.666672265625e+04, -2.717064453125e+04, -2.7325939453125e+04, -2.737107421875e+04, -2.7383642578125e+04, -2.738703125e+04, -2.3918869140625e+04, -1.2785947265625e+04, -4.97652294921875e+03, -1.616463745117183e+03, -4.679663696289062e+02, -1.260984344482422e+02, -3.243524932861319e+01, -8.081191062927246e+00, -1.968765258789062e+00, -4.716252088546753e-01, -5.801093139648438e+02, -6.04066259765625e+03, -1.4906681640625e+04, -2.1610474609375e+04, -2.5102759765625e+04, -2.6576609375e+04, -2.7121388671875e+04, -2.7305349609375e+04, -2.73635859375e+04, -2.738107421875e+04, -2.3917166015625e+04, -1.27854853515625e+04, -4.97639990234375e+03, -1.616437011718742e+03, -4.679638977050781e+02, -1.260972290039062e+02, -3.243424987792969e+01, -8.080669403076172e+00, -1.968744993209839e+00, -4.714556634426117e-01, -5.801091918945234e+02, -6.04065478515625e+03, -1.49067294921875e+04, -2.161048828125e+04, -2.5102802734375e+04, -2.6576619140625e+04, -2.7121396484375e+04, -2.7305333984375e+04, -2.73635703125e+04, -2.7381130859375e+04, -2.391719140625e+04, -1.27854931640625e+04, -4.97640234375e+03, -1.616437622070312e+03, -4.679640502929688e+02, -1.26097274780272e+02, -3.243426132202197e+01, -8.080671310424805e+00, -1.968745589256287e+00, -4.714558720588684e-01, -5.800953979492188e+02, -6.04060498046875e+03, -1.49067158203125e+04, -2.1610486328125e+04, -2.51027578125e+04, -2.6576595703125e+04, -2.7121384765625e+04, -2.7305384765625e+04, -2.73636484375e+04, -2.73812109375e+04, -2.391721875e+04, -1.2785501953125e+04, -4.97640478515625e+03, -1.616438354492188e+03, -4.679642333984375e+02, -1.260973205566406e+02, -3.243427276611328e+01, -8.080674171447754e+00, -1.968746066093445e+00, -4.714559018611908e-01, -5.800921630859641e+02, -6.040574707031175e+03, -1.49067197265625e+04, -2.16104921875e+04, -2.510285546875e+04, -2.6576658203125e+04, -2.7121390625e+04, -2.730537890625e+04, -2.7363615234375e+04, -2.7381166015625e+04, -2.3917203125e+04, -1.2785498046875e+04, -4.97640380859375e+03, -1.61643798828125e+03, -4.679641418457031e+02, -1.26097297668457e+02, -3.243426513671875e+01, -8.080673217773438e+00, -1.968745827674866e+00, -4.71455842256546e-01] -fan4.dp=[0e+00, -1.7029619140625e+04, -2.499365234375e+04, -2.6872728515625e+04, -2.7278783203125e+04, -2.7365044921875e+04, -2.738330859375e+04, -2.738718359375e+04, -2.7388005859375e+04, -2.73881796875e+04, -2.7388216796875e+04, -7.98509130859375e+03, -1.274897583007812e+03, -1.618067779541016e+02, -1.227907276153558e+01, -8.134369254112244e-01, -5.04227913916111e-02, -2.984987571835503e-03, -1.70716259162873e-04, -9.519848390482366e-06, -5.200854502618313e-07, -5.79449072265625e+03, -1.825158203125e+04, -2.4534767578125e+04, -2.6603796875e+04, -2.7185541015625e+04, -2.733769140625e+04, -2.737589453125e+04, -2.738526953125e+04, -2.7387525390625e+04, -2.738805078125e+04, -7.9850751953125e+03, -1.274897338867188e+03, -1.618069305419922e+02, -1.227913665771472e+01, -8.134126663208008e-01, -5.041937157511711e-02, -2.984585706144571e-03, -1.706803595880046e-04, -9.518960723653436e-06, -5.195761332288384e-07, -5.794474609374945e+03, -1.82515859375e+04, -2.4534744140625e+04, -2.66038046875e+04, -2.7185529296875e+04, -2.73376875e+04, -2.7375888671875e+04, -2.7385263671875e+04, -2.73875234375e+04, -2.7388060546875e+04, -7.985076171875e+03, -1.274897338867188e+03, -1.618069458007812e+02, -1.227913665771484e+01, -8.134127259254456e-01, -5.041937157511608e-02, -2.98458570614468e-03, -1.706803450360894e-04, -9.518960723653436e-06, -5.195761332288384e-07, -5.79441015625e+03, -1.825162890625e+04, -2.453474609375e+04, -2.660380859375e+04, -2.718555078125e+04, -2.7337705078125e+04, -2.737592578125e+04, -2.7385283203125e+04, -2.7387533203125e+04, -2.738806640625e+04, -7.9850771484375e+03, -1.2748974609375e+03, -1.618069610595703e+02, -1.227913761138916e+01, -8.134127855300903e-01, -5.041937530040741e-02, -2.984585938975215e-03, -1.706803595880046e-04, -9.518960723653436e-06, -5.195761332288384e-07, -5.794408691406376e+03, -1.82516171874999e+04, -2.453474609375e+04, -2.6603802734375e+04, -2.71855078125e+04, -2.7337673828125e+04, -2.7375916015625e+04, -2.738528125e+04, -2.738753125e+04, -2.7388064453125e+04, -7.9850771484375e+03, -1.2748974609375e+03, -1.618069458007812e+02, -1.227913761138916e+01, -8.134127259254456e-01, -5.041937530040741e-02, -2.984585706144571e-03, -1.706803595880046e-04, -9.518960723653436e-06, -5.195761332288384e-07] diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_SpeedControlled_Nrpm.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_SpeedControlled_Nrpm.txt deleted file mode 100644 index 5243535411..0000000000 --- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_SpeedControlled_Nrpm.txt +++ /dev/null @@ -1,19 +0,0 @@ -last-generated=2022-08-12 -statistics-initialization= -{ - "nonlinear": "1, 0, 1, 0", - "numerical Jacobians": "0" -} -statistics-simulation= -{ - "linear": " ", - "nonlinear": "1, 0, 1", - "number of continuous time states": "3", - "numerical Jacobians": "0" -} -time=[0e+00, 1e+00] -gain.u=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.8e-01, 9.6e-01, 9.399999999999999e-01, 9.2e-01, 9e-01, 8.8e-01, 8.6e-01, 8.4e-01, 8.2e-01, 8e-01, 7.8e-01, 7.6e-01, 7.4e-01, 7.2e-01, 7e-01, 6.8e-01, 6.6e-01, 6.4e-01, 6.2e-01, 6e-01, 5.8e-01, 5.600000000000001e-01, 5.4e-01, 5.2e-01, 5e-01, 4.799999701981039e-01, 4.59999970198246e-01, 4.399999403962078e-01, 4.200000298016828e-01, 4.00000029801967e-01, 3.800000000000709e-01, 3.600000000002133e-01, 3.399999701981751e-01, 3.199999403965277e-01, 3.00000059603579e-01, 2.800000298018961e-01, 2.599999999998579e-01, 2.399999850990164e-01, 2.199999701982105e-01, 1.999999552972269e-01, 1.800000596036677e-01, 1.600000298018249e-01, 1.400000149008946e-01, 1.199999925493573e-01, 9.999997764865798e-02, 7.99999552972359e-02, 6.00000558784486e-02, 4.000003725226355e-02, 2.000001862613177e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -floMacSta.dpMachine=[4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.794398617743659e+02, 4.60098378735429e+02, 4.411532615168607e+02, 4.226047515662231e+02, 4.044529938614071e+02, 3.866980632772671e+02, 3.693401366808059e+02, 3.523794165633871e+02, 3.358159238354154e+02, 3.196498318150345e+02, 3.03881339468104e+02, 2.885104442652517e+02, 2.735373770073344e+02, 2.589621987299449e+02, 2.447850577938055e+02, 2.31006037638156e+02, 2.17625242166598e+02, 2.046428466961402e+02, 1.92058850206186e+02, 1.798734141037055e+02, 1.68086649106894e+02, 1.566985918106157e+02, 1.457093695701548e+02, 1.351190895372946e+02, 1.249277725219727e+02, 1.151355423425644e+02, 1.057424675876581e+02, 9.674862455141749e+01, 8.815413186832403e+01, 7.995896343619431e+01, 7.21632250871787e+01, 6.47669855429761e+01, 5.777030580097554e+01, 5.117323161869565e+01, 4.497585973124306e+01, 3.918022580065193e+01, 3.379532490656646e+01, 2.882868923497502e+01, 2.428444630137457e+01, 2.016343911214301e+01, 1.646309634831643e+01, 1.317693850012823e+01, 1.029396252050215e+01, 7.797536307782446e+00, 5.664503184096723e+00, 3.865953326378335e+00, 2.373942729492089e+00, 1.189011777832478e+00, 3.556552820124339e-01, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00] -floMacDyn.dpMachine=[3.819660034179688e+02, 4.766992499358793e+02, 4.943363955481709e+02, 4.981237183545724e+02, 4.989477539332347e+02, 4.991255798274815e+02, 4.991662292500728e+02, 4.991748657225244e+02, 4.991771240235466e+02, 4.991775512693675e+02, 4.991780700682912e+02, 4.991782226562409e+02, 4.99177947997965e+02, 4.99177673339771e+02, 4.991776733398347e+02, 4.991777648924872e+02, 4.991777954101562e+02, 4.991777648926054e+02, 4.99177703857531e+02, 4.991776733398438e+02, 4.991776428222656e+02, 4.991776123046875e+02, 4.991776123047057e+02, 4.991776123047512e+02, 4.991776428222656e+02, 4.991776733398438e+02, 4.819452031532197e+02, 4.630534261794696e+02, 4.441022666518538e+02, 4.254541472229342e+02, 4.071856905353997e+02, 3.893125042234302e+02, 3.718374815688907e+02, 3.54762564905012e+02, 3.380877439432832e+02, 3.21812887171019e+02, 3.059381023140285e+02, 2.904635082790626e+02, 2.753893972236399e+02, 2.607158912185096e+02, 2.464431389047906e+02, 2.325712078935821e+02, 2.191001260834498e+02, 2.060300537893813e+02, 1.933609589508802e+02, 1.810929574643305e+02, 1.69226358645252e+02, 1.577611680955661e+02, 1.466975897070733e+02, 1.360358071337484e+02, 1.257754516601562e+02, 1.159164260692366e+02, 1.064593177506969e+02, 9.740517955879956e+01, 8.875274191509273e+01, 8.050211535650894e+01, 7.265348999210792e+01, 6.520702609656742e+01, 5.816281137017207e+01, 5.152093353176446e+01, 4.528155059352893e+01, 3.945436141349783e+01, 3.410650117095461e+01, 2.925580188373673e+01, 2.486386852004861e+01, 2.089062944515968e+01, 1.730616517009572e+01, 1.408298434764626e+01, 1.119890600817512e+01, 8.629098322079875e+00, 6.353054878150746e+00, 4.361795801581371e+00, 2.662918775992468e+00, 1.305368440178004e+00, 3.715901946611515e-01, -2.317575854249299e-05, 1.625591761384986e-07, -5.398772484419601e-09, -1.062289187180899e-09, -8.731153820694205e-10, -6.839402759373578e-10, -5.093170676877553e-10, -3.201420309424247e-10, -1.45518787997906e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -floMacSta.VMachine_flow=[8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.179551799330834e-01, 8.012098253604085e-01, 7.844675203252821e-01, 7.677283147381856e-01, 7.509921988664439e-01, 7.342589537458853e-01, 7.175286292588894e-01, 7.008012156472726e-01, 6.840764939988395e-01, 6.673544545648926e-01, 6.506350875641913e-01, 6.339182933405832e-01, 6.172039429126689e-01, 6.004920362800221e-01, 5.837825636319149e-01, 5.670753657677331e-01, 5.503703732797423e-01, 5.336675763383496e-01, 5.169668753863813e-01, 5.00268200996563e-01, 4.835715433205083e-01, 4.668767432339683e-01, 4.501837908951999e-01, 4.334926764397228e-01, 4.168032109737396e-01, 4.001154144414578e-01, 3.834291676330666e-01, 3.667444407458171e-01, 3.500612736084016e-01, 3.33379377938475e-01, 3.166987935734454e-01, 3.00019460908206e-01, 2.833413203380766e-01, 2.666642824562558e-01, 2.499884168513041e-01, 2.333011270105493e-01, 2.165425797956496e-01, 1.996426948237181e-01, 1.825317195393328e-01, 1.651394245822069e-01, 1.47396194194614e-01, 1.292373546042894e-01, 1.106163174348533e-01, 9.153306023404656e-02, 7.209600415124648e-02, 5.264118295486991e-02, 3.392443780500445e-02, 1.744533575602981e-02, 5.264308190498649e-03, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00] -floMacDyn.VMachine_flow=[1.030056595802307e+00, 8.721678841896618e-01, 8.42772662165464e-01, 8.364604709985033e-01, 8.350870608833674e-01, 8.347907066453573e-01, 8.347229361500546e-01, 8.347085118296071e-01, 8.347047567365955e-01, 8.34704101085876e-01, 8.347032666207248e-01, 8.347029685974299e-01, 8.347034454347302e-01, 8.347038626672258e-01, 8.347039222717285e-01, 8.347037434579718e-01, 8.347036838531494e-01, 8.347037434577409e-01, 8.34703803062439e-01, 8.347038626671548e-01, 8.347039222717285e-01, 8.347039818763733e-01, 8.347039818763378e-01, 8.347039818763733e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.136944596565525e-01, 7.960795347717832e-01, 7.792388816753005e-01, 7.625664333706792e-01, 7.459317643988921e-01, 7.293075362732457e-01, 7.126890302062875e-01, 6.960729578457985e-01, 6.794591605470209e-01, 6.628483434863087e-01, 6.462406157589643e-01, 6.296355803508913e-01, 6.130330483431568e-01, 5.964329601306898e-01, 5.798351863604067e-01, 5.632395684979322e-01, 5.466463944304053e-01, 5.300555347848119e-01, 5.134671290906079e-01, 4.968811373891713e-01, 4.802971024612471e-01, 4.637149552606244e-01, 4.471343577842296e-01, 4.305551508223537e-01, 4.139783382415771e-01, 3.974047145164949e-01, 3.808326405081978e-01, 3.64258271725198e-01, 3.476866541221091e-01, 3.3111708351209e-01, 3.145493904512701e-01, 2.979831577073159e-01, 2.814182064654735e-01, 2.64854298307295e-01, 2.482911147216521e-01, 2.316704333640658e-01, 2.145492815619662e-01, 1.966789873632548e-01, 1.781460521916592e-01, 1.590855405758219e-01, 1.395988830026544e-01, 1.198117468876128e-01, 9.985970642921581e-02, 8.000471719956283e-02, 6.064589678943654e-02, 4.23407371539888e-02, 2.592865146005137e-02, 1.250635008308209e-02, 3.372658913925401e-03, 1.545050909044221e-04, -1.083776081714321e-06, 3.596003283436759e-08, 7.040317728998752e-09, 5.823099285461279e-09, 4.606124933296064e-09, 3.388560389995756e-09, 2.171607801563245e-09, 9.54233552637677e-10, 4.654012055599654e-11, 4.427231439097093e-11, 4.307033202310961e-11, 4.133592514019411e-11, 3.923276939677873e-11, 3.778093614052413e-11, 3.578643442666455e-11, 3.44232142790446e-11, 3.280731137566852e-11, 3.138845483459439e-11, 2.916008325547038e-11, 2.718313176416255e-11, 2.5699724654422e-11, 2.417070321639934e-11, 2.228625286307288e-11, 2.075788413213941e-11, 1.928186776911645e-11]