From b4b7801a06bb95a1aaa9bd3195ca5f6469829dc6 Mon Sep 17 00:00:00 2001 From: Michael Wetter Date: Wed, 22 Nov 2023 11:14:17 -0800 Subject: [PATCH 1/2] Corrected wrong use of getInstanceName() For #1814. This function cannot be called inside a function --- .../Validation/InternalResistancesOneUTube.mo | 10 +++++++++- .../Validation/InternalResistancesOneUTubeNegative.mo | 10 +++++++++- .../Validation/InternalResistancesTwoUTube.mo | 10 +++++++++- .../Validation/InternalResistancesTwoUTubeNegative.mo | 10 +++++++++- .../Functions/internalResistancesOneUTube.mo | 9 ++++++++- .../Functions/internalResistancesTwoUTube.mo | 9 ++++++++- .../Functions/partialInternalResistances.mo | 9 +++++++++ .../Boreholes/BaseClasses/InternalHEXOneUTube.mo | 10 +++++++++- .../Boreholes/BaseClasses/InternalHEXTwoUTube.mo | 10 +++++++++- 9 files changed, 79 insertions(+), 8 deletions(-) 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="