diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index 4c968bf60ec..592372baf5f 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -80,7 +80,7 @@ jobs: rm Resources/Scripts/OpenModelica/compareVars/*.mos python -c 'import buildingspy.development.regressiontest as u; u.Tester().writeOpenModelicaResultDictionary()' git status --porcelain Resources/Scripts/OpenModelica - test -z $(git status --porcelain Resources/Scripts/OpenModelica) + test -z "$(git status --porcelain Resources/Scripts/OpenModelica)" - name: "Test user guide" run : (cd Resources/Documentation/userGuide; make regressiontest) @@ -93,6 +93,6 @@ jobs: cd .. python Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py git diff --exit-code Buildings - + - name: Check for UTF-8 BOM - run: "! find . -name '*.mo' -print0 | xargs -0 grep -l $'^\\xEF\\xBB\\xBF' | grep ." + run: "! find . -name '*.mo' -print0 | xargs -0 grep -l $'^\\xEF\\xBB\\xBF' | grep ." diff --git a/Buildings/.copiedFiles.txt b/Buildings/.copiedFiles.txt index a774040bb39..ef4215c7766 100644 --- a/Buildings/.copiedFiles.txt +++ b/Buildings/.copiedFiles.txt @@ -487,12 +487,8 @@ Buildings/Fluid/FMI/Validation/package.order Buildings/Fluid/FMI/package.mo Buildings/Fluid/FMI/package.order Buildings/Fluid/FixedResistances/BaseClasses/PlugFlow.mo -Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo -Buildings/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo -Buildings/Fluid/FixedResistances/BaseClasses/Validation/package.mo -Buildings/Fluid/FixedResistances/BaseClasses/Validation/package.order Buildings/Fluid/FixedResistances/BaseClasses/package.mo Buildings/Fluid/FixedResistances/BaseClasses/package.order Buildings/Fluid/FixedResistances/CheckValve.mo @@ -1646,7 +1642,6 @@ Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/FlowSplitter_u.mos Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFan.mos Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFanPressureDriven.mos Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mos -Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mos Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/CheckValve.mos Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/FlowJunction.mos Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/HydraulicDiameter.mos diff --git a/Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo b/Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo index 52b21535607..6f76df5a680 100644 --- a/Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo +++ b/Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo @@ -23,12 +23,13 @@ model PlugFlowTransportDelay "Delay time for given normalized velocity" if initDelay and (abs(m_flow_start) > 1E-10*m_flow_nominal) then min(-length/m_flow_start*(rho*dh^2/4*Modelica.Constants.pi), 0) else 0 "Initial value of input time at outlet"; - + final parameter Real conUM(unit="1/kg") = 4/rho/dh/dh/Modelica.Constants.pi/length + "Constant to convert mass flow rate into velocity normalized by the pipe length"; Modelica.SIunits.Time time_out_rev "Reverse flow direction output time"; Modelica.SIunits.Time time_out_des "Design flow direction output time"; Real x(start=0) "Spatial coordinate for spatialDistribution operator"; - Modelica.SIunits.Frequency u "Normalized fluid velocity (1/s)"; + Real u(unit="1/s") "Normalized fluid velocity (1/s)"; Modelica.Blocks.Interfaces.RealInput m_flow "Mass flow of fluid" annotation ( Placement(transformation(extent={{-140,-20},{-100,20}}), @@ -48,8 +49,7 @@ initial equation t0 = time; equation - u = m_flow/(rho*(dh^2)/4*Modelica.Constants.pi)/length; - + u = m_flow * conUM; der(x) = u; (time_out_rev, time_out_des) = spatialDistribution( time, @@ -119,17 +119,14 @@ function. This components requires the mass flow through the pipe and the pipe dimensions in order to derive information about the fluid propagation.

-The component calculates the delay time at both in/outlet ports of the pipe -and therefore has two outlets. During forward flow, only the forward - -Buildings.Fluid.FixedResistances.BaseClasses.PlugFlowTransportDelay component in - -Buildings.Fluid.FixedResistances.BaseClasses.PlugFlowCore -will be active and uses the forward output of PlugFlowTransportDelay. -During reverse, the opposite is true and only the reverse output is used. +The component calculates the delay time at the inlet and the outlet port of the pipe. +For the forward flow, the time delay is exposed at the output tau, +and for the backward flow, the time delay is exposed at the output tauRev.

Assumption

-

It is assumed that no axial mixing takes place in the pipe.

+

+No axial mixing takes place in the pipe. +

", revisions="