diff --git a/.travis.yml b/.travis.yml
index 4238290ed80..dd4cbc9a18b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,7 @@ services:
env:
global:
+ - DOCKER_REPONAME=lbnlblum
- BUILDINGSPY_VERSION=BuildingsPy@v5.0.0
- OMC_VERSION=ubuntu-2204-omc:1.22.0_dev-41-g8a5b18f-1
- OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.43.4
@@ -113,11 +114,11 @@ env:
before_install:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- if [[ "$TEST_ARG" == *test-dymola* || "$TEST_ARG" == *test-bestest* || "$TEST_ARG" == *spawn-portability* ]]; then
- docker pull "$DOCKER_USERNAME"/${DYMOLA_VERSION};
+ docker pull "$DOCKER_REPONAME"/${DYMOLA_VERSION};
cp Buildings/Resources/Scripts/travis/dymola/dymola $HOME/bin/;
fi;
- if [[ "$TEST_ARG" == *test-optimica* ]]; then
- docker pull "$DOCKER_USERNAME"/${OPTIMICA_VERSION};
+ docker pull "$DOCKER_REPONAME"/${OPTIMICA_VERSION};
cp Buildings/Resources/Scripts/travis/optimica/jm_ipython.sh $HOME/bin/jm_ipython.sh;
fi;
# The Spawn idf reference results are generated with EnergyPlus 9.6.0,
@@ -144,7 +145,7 @@ before_install:
echo "Installed modelica-json in ${MODELICA_JSON_HOME}";
fi;
- if [[ "$TEST_ARG" == *test-openmodelica* ]]; then
- docker pull "$DOCKER_USERNAME"/${OMC_VERSION};
+ docker pull lbnlblum/${OMC_VERSION};
cp Buildings/Resources/Scripts/travis/omc/omc $HOME/bin/omc;
fi;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo
index 003dad5d50d..deb11cafe87 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo
+++ b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo
@@ -102,7 +102,8 @@ partial model PartialMultiplePumps
final per=per,
addPowerToMedium=false) "Pump"
annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
- MultipleCommands com(final nUni=nPum) "Convert command signal"
+ Buildings.Templates.Components.Controls.MultipleCommands com(final nUni=nPum)
+ "Convert command signal"
annotation (Placement(transformation(extent={{-50,90},{-30,110}})));
Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea
@@ -241,7 +242,7 @@ equation
This base class represents multiple identical pumps that are piped in parallel.
An optional check valve in series with each pump is included.
-This class is used to construct the various multiple-pump models within
+This class is used to construct the various multiple-pump models within
Buildings.Experimental.DHC.Plants.Combined.Subsystems.
@@ -249,7 +250,7 @@ Buildings.Experimental.DHC.Plants.Combined.Subsystems.
In a parallel arrangement, all operating units have the same operating point.
This allows modeling the multiple pumps with a single instance of any
-class derived from
+class derived from
Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine.
Hydronics are resolved with mass flow rate multiplier components.
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/package.order b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/package.order
index 40e1fe5f8fd..ca855f23a33 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/package.order
+++ b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/package.order
@@ -1,4 +1,3 @@
-MultipleCommands
MultipleValves
PartialMultiplePumps
PassThroughFluid
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerGroup.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerGroup.mo
index 2fe18aac864..e955a5ebb4d 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerGroup.mo
+++ b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerGroup.mo
@@ -192,7 +192,7 @@ model ChillerGroup
final use_input=true)
"Flow rate multiplier"
annotation (Placement(transformation(extent={{-30,-70},{-50,-50}})));
- BaseClasses.MultipleCommands com(
+ Buildings.Templates.Components.Controls.MultipleCommands com(
final nUni=nUni)
"Convert command signals"
annotation (Placement(transformation(extent={{-80,110},{-60,130}})));
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo
index db8f8f8126c..c60857b7a34 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo
+++ b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo
@@ -93,7 +93,7 @@ model CoolingTowerGroup "Model of multiple identical cooling towers in parallel"
final use_input=false,
final k=nUni) "Flow rate multiplier"
annotation (Placement(transformation(extent={{60,-10},{80,10}})));
- BaseClasses.MultipleCommands com(final nUni=nUni)
+ Buildings.Templates.Components.Controls.MultipleCommands com(final nUni=nUni)
"Convert command signals"
annotation (Placement(transformation(extent={{-60,90},{-40,110}})));
Buildings.Controls.OBC.CDL.Reals.Multiply mulP "Scale power"
@@ -222,7 +222,7 @@ The following input and output points are available.
-
-Start command (VFD Run)
y1:
+Start command (VFD Run) y1:
DO signal dedicated to each unit, with a dimensionality of one
-
@@ -230,7 +230,7 @@ Speed command
y:
AO signal common to all units, with a dimensionality of zero
-
-CW supply temperature
TConWatSup:
+CW supply temperature TConWatSup:
AI signal common to all units, with a dimensionality of zero
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo
index 4e830ac8dea..a49ae54b1a9 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo
+++ b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo
@@ -108,7 +108,7 @@ model HeatPumpGroup
final use_input=true)
"Flow rate multiplier"
annotation (Placement(transformation(extent={{60,-10},{80,10}})));
- BaseClasses.MultipleCommands com(final nUni=nUni)
+ Buildings.Templates.Components.Controls.MultipleCommands com(final nUni=nUni)
"Convert command signals"
annotation (Placement(transformation(extent={{-60,90},{-40,110}})));
Buildings.Controls.OBC.CDL.Reals.Multiply mulP "Scale power"
diff --git a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo
index 8abb23979c0..4903667333d 100644
--- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo
+++ b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo
@@ -57,7 +57,8 @@ initial equation
kMed=kMed,
muMed=muMed,
cpMed=cpMed,
- m_flow_nominal=m_flow_nominal);
+ m_flow_nominal=m_flow_nominal,
+ instanceName=getInstanceName());
annotation (
__Dymola_Commands(file=
@@ -75,6 +76,13 @@ borehole.