From dbdfec455e1c4cf619991a4bfc0cb40a8ee5eda5 Mon Sep 17 00:00:00 2001 From: Jianjun Hu Date: Fri, 30 Aug 2024 05:22:39 -0700 Subject: [PATCH] Maint 9.1.x issue3970 media choices (#3974) * corrected media choices --- Buildings/Fluid/Interfaces/EightPort.mo | 31 +++++++++++-------- Buildings/Fluid/Interfaces/PartialFourPort.mo | 25 +++++++++------ 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/Buildings/Fluid/Interfaces/EightPort.mo b/Buildings/Fluid/Interfaces/EightPort.mo index 762ade548c3..3ef041e244d 100644 --- a/Buildings/Fluid/Interfaces/EightPort.mo +++ b/Buildings/Fluid/Interfaces/EightPort.mo @@ -4,9 +4,9 @@ partial model EightPort "Partial model with eight ports" replaceable package Medium1 = Modelica.Media.Interfaces.PartialMedium "Medium 1 in the component" annotation (choices( - choice(redeclare package Medium = Buildings.Media.Air "Moist air"), - choice(redeclare package Medium = Buildings.Media.Water "Water"), - choice(redeclare package Medium = + choice(redeclare package Medium1 = Buildings.Media.Air "Moist air"), + choice(redeclare package Medium1 = Buildings.Media.Water "Water"), + choice(redeclare package Medium1 = Buildings.Media.Antifreeze.PropyleneGlycolWater ( property_T=293.15, X_a=0.40) @@ -14,9 +14,9 @@ partial model EightPort "Partial model with eight ports" replaceable package Medium2 = Modelica.Media.Interfaces.PartialMedium "Medium 2 in the component" annotation (choices( - choice(redeclare package Medium = Buildings.Media.Air "Moist air"), - choice(redeclare package Medium = Buildings.Media.Water "Water"), - choice(redeclare package Medium = + choice(redeclare package Medium2 = Buildings.Media.Air "Moist air"), + choice(redeclare package Medium2 = Buildings.Media.Water "Water"), + choice(redeclare package Medium2 = Buildings.Media.Antifreeze.PropyleneGlycolWater ( property_T=293.15, X_a=0.40) @@ -24,9 +24,9 @@ partial model EightPort "Partial model with eight ports" replaceable package Medium3 = Modelica.Media.Interfaces.PartialMedium "Medium 3 in the component" annotation (choices( - choice(redeclare package Medium = Buildings.Media.Air "Moist air"), - choice(redeclare package Medium = Buildings.Media.Water "Water"), - choice(redeclare package Medium = + choice(redeclare package Medium3 = Buildings.Media.Air "Moist air"), + choice(redeclare package Medium3 = Buildings.Media.Water "Water"), + choice(redeclare package Medium3 = Buildings.Media.Antifreeze.PropyleneGlycolWater ( property_T=293.15, X_a=0.40) @@ -34,9 +34,9 @@ partial model EightPort "Partial model with eight ports" replaceable package Medium4 = Modelica.Media.Interfaces.PartialMedium "Medium 4 in the component" annotation (choices( - choice(redeclare package Medium = Buildings.Media.Air "Moist air"), - choice(redeclare package Medium = Buildings.Media.Water "Water"), - choice(redeclare package Medium = + choice(redeclare package Medium4 = Buildings.Media.Air "Moist air"), + choice(redeclare package Medium4 = Buildings.Media.Water "Water"), + choice(redeclare package Medium4 = Buildings.Media.Antifreeze.PropyleneGlycolWater ( property_T=293.15, X_a=0.40) @@ -151,9 +151,14 @@ may be used by models that extend this model to treat flow reversal.

", revisions=" diff --git a/Buildings/Fluid/Interfaces/PartialFourPort.mo b/Buildings/Fluid/Interfaces/PartialFourPort.mo index c350a8f510c..5675a5322fe 100644 --- a/Buildings/Fluid/Interfaces/PartialFourPort.mo +++ b/Buildings/Fluid/Interfaces/PartialFourPort.mo @@ -4,9 +4,9 @@ partial model PartialFourPort "Partial model with four ports" replaceable package Medium1 = Modelica.Media.Interfaces.PartialMedium "Medium 1 in the component" annotation (choices( - choice(redeclare package Medium = Buildings.Media.Air "Moist air"), - choice(redeclare package Medium = Buildings.Media.Water "Water"), - choice(redeclare package Medium = + choice(redeclare package Medium1 = Buildings.Media.Air "Moist air"), + choice(redeclare package Medium1 = Buildings.Media.Water "Water"), + choice(redeclare package Medium1 = Buildings.Media.Antifreeze.PropyleneGlycolWater ( property_T=293.15, X_a=0.40) @@ -14,9 +14,9 @@ partial model PartialFourPort "Partial model with four ports" replaceable package Medium2 = Modelica.Media.Interfaces.PartialMedium "Medium 2 in the component" annotation (choices( - choice(redeclare package Medium = Buildings.Media.Air "Moist air"), - choice(redeclare package Medium = Buildings.Media.Water "Water"), - choice(redeclare package Medium = + choice(redeclare package Medium2 = Buildings.Media.Air "Moist air"), + choice(redeclare package Medium2 = Buildings.Media.Water "Water"), + choice(redeclare package Medium2 = Buildings.Media.Antifreeze.PropyleneGlycolWater ( property_T=293.15, X_a=0.40) @@ -83,20 +83,25 @@ are not implemented. ", revisions="