Skip to content

Commit 15ce3c1

Browse files
authored
Merge pull request #4540 from lbl-srg/maint_10.0.x_patch_userGuide_format
Updated userguide format (maint_10.0.x)
2 parents 6a51a71 + d1510a6 commit 15ce3c1

74 files changed

Lines changed: 5104 additions & 29242 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/formatting.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
# Skip if the commit message contains "ci skip"
2525
if: "!contains(github.event.head_commit.message, 'ci skip')"
2626

27-
runs-on: ubuntu-22.04
27+
runs-on: ubuntu-24.04
2828

2929
steps:
3030
# Checks-out repository under $GITHUB_WORKSPACE, so job can access it
@@ -33,11 +33,11 @@ jobs:
3333

3434
- uses: actions/setup-python@v4
3535
with:
36-
python-version: '3.10.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
36+
python-version: '3.12.3' # Version range or exact version of a Python version to use, using SemVer's version range syntax
3737
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
3838

3939
- name: "Install pip"
40-
run: pip3 install --upgrade pip wheel
40+
run: pip3 install --upgrade pip
4141

4242
- name: "Install BuildingsPy"
4343
run: pip3 install git+https://github.com/lbl-srg/BuildingsPy@v5.1.0

Buildings/Resources/Documentation/userGuide/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ html:
4444
regressiontest: clean
4545
@echo "Verify whether all files compile and no uncommitted changes exist"
4646
@rm -rf virEnv
47-
python -m venv virEnv
48-
source virEnv/bin/activate
49-
pip install -r requirements.txt --no-deps
50-
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
47+
python3 -m venv virEnv
48+
source virEnv/bin/activate && \
49+
pip install -r requirements.txt --no-deps && \
50+
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html && \
5151
rm -rf virEnv
5252
git diff --exit-code .
5353

Buildings/Resources/Documentation/userGuide/build/html/_sources/bestPractice.rst.txt

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ Building large system models
4242
When creating a large system model, it is typically easier to build the system model
4343
through the composition of subsystem models that can be tested in isolation. For example,
4444
the package
45-
`Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Examples_ChillerPlant_BaseClasses_Controls_Examples.html#Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples>`_
45+
`Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Examples_ChillerPlant_BaseClasses_Controls_Examples.html#Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples>`_
4646
contains small test models that are used to test individual components in the large system model
47-
`Buildings.Examples.ChillerPlant <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Examples_ChillerPlant.html#Buildings.Examples.ChillerPlant>`_.
47+
`Buildings.Examples.ChillerPlant <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Examples_ChillerPlant.html#Buildings.Examples.ChillerPlant>`_.
4848
Creating small test models typically saves time as the proper response of controls, and the proper operation of subsystems, can be tested in isolation of complex system-interactions that are often present in large models.
4949

5050

@@ -111,8 +111,8 @@ We will now explain how state variables, such as temperature and pressure, can b
111111

112112
Consider a model consisting of a mass flow source ``Modelica.Fluid.Sources.MassFlowSource_T``, a fluid volume ``Buildings.Fluid.MixingVolumes.MixingVolume`` and
113113
a fixed boundary condition ``Buildings.Fluid.Sources.Boundary_pT``,
114-
connected in series as shown in the figure below. Note that the instance ``bou``
115-
implements an equation that sets the medium pressure at its port, i.e., the port pressure ``bou.ports.p`` is fixed.
114+
connected in series as shown in the figure below. Note that the instance ``sin``
115+
implements an equation that sets the medium pressure at its port, i.e., the port pressure ``sin.ports.p`` is fixed.
116116

117117
.. figure:: img/MixingVolumeInitialization.*
118118
:width: 300px
@@ -270,9 +270,9 @@ a fluid port represents the physical phenomena that was intended to model.
270270

271271
However, in more complex flow configurations, one may want to explicitly control what branches of a piping or duct network mix.
272272
This may be achieved by using an instance of the model
273-
`Junction <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction>`_
273+
`Junction <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction>`_
274274
as shown in the left figure below, which is derived from the test model
275-
`BoilerPolynomialClosedLoop <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Boilers_Examples.html#Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop>`_
275+
`BoilerPolynomialClosedLoop <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Boilers_Examples.html#Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop>`_
276276

277277
.. _fig_flu_cor_wro:
278278

@@ -283,7 +283,7 @@ as shown in the left figure below, which is derived from the test model
283283

284284
In :numref:`fig_flu_cor_wro` (a), the mixing points have been correctly defined by
285285
use of the model
286-
`Junction <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction>`_.
286+
`Junction <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction>`_.
287287
However, in :numref:`fig_flu_cor_wro` (b), all connections are made to the port of the instance ``spl2``.
288288
This results in the same configuration as is shown in :numref:`fig_flu_cor_wro` (c).
289289
This is certainly not the intention of the modeler, as this causes all flows to be mixed in the port.
@@ -301,13 +301,13 @@ Use of sensors in fluid flow systems
301301
When selecting a sensor model, a distinction needs to be made whether the measured quantity depends on
302302
the direction of the flow or not. If the quantity depends on the flow direction,
303303
such as temperature or relative humidity, then sensors with two ports from the
304-
`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_
304+
`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_
305305
library should be used. These sensors have a more efficient implementation than sensors with
306306
one port for situations where the flow reverses its direction.
307307
The proper use sensors is described in the
308-
`User's Guide <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors_UsersGuide.html>`_
308+
`User's Guide <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors_UsersGuide.html>`_
309309
of the
310-
`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_
310+
`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_
311311
package.
312312

313313

@@ -319,9 +319,9 @@ Reference pressure for incompressible fluids such as water
319319
This section explains how to set a reference pressure for fluids that model
320320
the flow as :term:`incompressible flow`,
321321
such as
322-
`Buildings.Media.Water <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Media_Water.html#Buildings.Media.Water>`_
322+
`Buildings.Media.Water <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Media_Water.html#Buildings.Media.Water>`_
323323
and
324-
`Buildings.Media.Antifreeze.PropyleneGlycolWater <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Media_Antifreeze_PropyleneGlycolWater.html#Buildings.Media.Antifreeze.PropyleneGlycolWater>`_.
324+
`Buildings.Media.Antifreeze.PropyleneGlycolWater <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Media_Antifreeze_PropyleneGlycolWater.html#Buildings.Media.Antifreeze.PropyleneGlycolWater>`_.
325325

326326
Consider the flow circuit shown in :numref:`fig_flow_cir` that consists of a pump or fan,
327327
a flow resistance and a volume.
@@ -354,7 +354,7 @@ In this situation, attempting to translate the model leads, in Dymola, to the fo
354354
The number of scalar Real equation elements are 58.
355355
356356
Similarly, if the medium model
357-
`Buildings.Media.Specialized.Water.TemperatureDependentDensity <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Media_Specialized_Water_TemperatureDependentDensity.html#Buildings.Media.Specialized.Water.TemperatureDependentDensity>`_,
357+
`Buildings.Media.Specialized.Water.TemperatureDependentDensity <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Media_Specialized_Water_TemperatureDependentDensity.html#Buildings.Media.Specialized.Water.TemperatureDependentDensity>`_,
358358
which models density as a function of pressure and enthalpy, is used, then
359359
the model is well-defined, but the pressure increases the longer the pump runs.
360360
The reason is that the pump adds heat to the water. When the water temperature
@@ -364,7 +364,7 @@ the pressure increases from :math:`1 \, \mathrm{bars}` to :math:`150 \, \mathrm{
364364
To avoid this singularity or increase in pressure,
365365
use a model that imposes a pressure source and that accounts for the expansion of the fluid.
366366
For example, use
367-
`Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
367+
`Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
368368
to form the system model shown in :numref:`fig_flow_cir_wit_bou`.
369369

370370
.. _fig_flow_cir_wit_bou:
@@ -376,15 +376,15 @@ to form the system model shown in :numref:`fig_flow_cir_wit_bou`.
376376
provides a reference presssure.
377377

378378
Alternatively, you may use
379-
`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_,
379+
`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_,
380380
but
381-
`Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
381+
`Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
382382
usually leads to simpler equations than
383-
`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_.
383+
`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_.
384384
Note that the medium that flows out of the fluid port of
385-
`Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
385+
`Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
386386
is at a fixed temperature, while the model
387-
`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_
387+
`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_
388388
conserves energy.
389389
However, since the thermal expansion of the fluid is usually small,
390390
this effect can be neglected in most building HVAC applications.
@@ -393,10 +393,10 @@ this effect can be neglected in most building HVAC applications.
393393

394394
In each water circuit, there must be exactly on instance of
395395
`Buildings.Fluid.Sources.Boundary_pT
396-
<https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_,
396+
<https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_,
397397
or instance of
398398
`Buildings.Fluid.Storage.ExpansionVessel
399-
<https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_.
399+
<https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_.
400400

401401
If there is more than one such device, then there are multiple
402402
points in the system that set the reference static pressure.
@@ -592,5 +592,5 @@ is produced. This shows the iteration variables and their start values.
592592
These start values can be overwritten in the model.
593593

594594

595-
.. _PressureDrop: https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.PressureDrop
596-
.. _WetCoilDiscretized: https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_HeatExchangers.html#Buildings.Fluid.HeatExchangers.WetCoilDiscretized
595+
.. _PressureDrop: https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.PressureDrop
596+
.. _WetCoilDiscretized: https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_HeatExchangers.html#Buildings.Fluid.HeatExchangers.WetCoilDiscretized

0 commit comments

Comments
 (0)