diff --git a/.travis.yml b/.travis.yml index a1b89ee8ab..a47103c0b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,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 - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2023x-x86_64_rev-1 @@ -44,11 +45,11 @@ env: before_install: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - if [[ "$TEST_ARG" == *test-dymola* || "$TEST_ARG" == *test-bestest* ]]; then - docker pull "$DOCKER_USERNAME"/${DYMOLA_VERSION}; + docker pull "$DOCKER_REPONAME"/${DYMOLA_VERSION}; cp IBPSA/Resources/Scripts/travis/dymola/dymola $HOME/bin/; fi; - if [[ "$TEST_ARG" == *test-openmodelica* ]]; then - docker pull "$DOCKER_USERNAME"/${OMC_VERSION}; + docker pull "$DOCKER_REPONAME"/${OMC_VERSION}; cp IBPSA/Resources/Scripts/travis/omc/omc $HOME/bin/omc; fi; diff --git a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo index 0fb0e0cbd8..9b8d86d942 100644 --- a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo +++ b/IBPSA/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. ", revisions="