diff --git a/IBPSA/Fluid/Interfaces/EightPort.mo b/IBPSA/Fluid/Interfaces/EightPort.mo index dd3a0a0c7a..41b1b1c658 100644 --- a/IBPSA/Fluid/Interfaces/EightPort.mo +++ b/IBPSA/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 = IBPSA.Media.Air "Moist air"), - choice(redeclare package Medium = IBPSA.Media.Water "Water"), - choice(redeclare package Medium = + choice(redeclare package Medium1 = IBPSA.Media.Air "Moist air"), + choice(redeclare package Medium1 = IBPSA.Media.Water "Water"), + choice(redeclare package Medium1 = IBPSA.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 = IBPSA.Media.Air "Moist air"), - choice(redeclare package Medium = IBPSA.Media.Water "Water"), - choice(redeclare package Medium = + choice(redeclare package Medium2 = IBPSA.Media.Air "Moist air"), + choice(redeclare package Medium2 = IBPSA.Media.Water "Water"), + choice(redeclare package Medium2 = IBPSA.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 = IBPSA.Media.Air "Moist air"), - choice(redeclare package Medium = IBPSA.Media.Water "Water"), - choice(redeclare package Medium = + choice(redeclare package Medium3 = IBPSA.Media.Air "Moist air"), + choice(redeclare package Medium3 = IBPSA.Media.Water "Water"), + choice(redeclare package Medium3 = IBPSA.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 = IBPSA.Media.Air "Moist air"), - choice(redeclare package Medium = IBPSA.Media.Water "Water"), - choice(redeclare package Medium = + choice(redeclare package Medium4 = IBPSA.Media.Air "Moist air"), + choice(redeclare package Medium4 = IBPSA.Media.Water "Water"), + choice(redeclare package Medium4 = IBPSA.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/IBPSA/Fluid/Interfaces/PartialFourPort.mo b/IBPSA/Fluid/Interfaces/PartialFourPort.mo index 1d5cb458ca..f9bd0497dd 100644 --- a/IBPSA/Fluid/Interfaces/PartialFourPort.mo +++ b/IBPSA/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 = IBPSA.Media.Air "Moist air"), - choice(redeclare package Medium = IBPSA.Media.Water "Water"), - choice(redeclare package Medium = + choice(redeclare package Medium1 = IBPSA.Media.Air "Moist air"), + choice(redeclare package Medium1 = IBPSA.Media.Water "Water"), + choice(redeclare package Medium1 = IBPSA.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 = IBPSA.Media.Air "Moist air"), - choice(redeclare package Medium = IBPSA.Media.Water "Water"), - choice(redeclare package Medium = + choice(redeclare package Medium2 = IBPSA.Media.Air "Moist air"), + choice(redeclare package Medium2 = IBPSA.Media.Water "Water"), + choice(redeclare package Medium2 = IBPSA.Media.Antifreeze.PropyleneGlycolWater ( property_T=293.15, X_a=0.40) @@ -83,20 +83,25 @@ are not implemented. ", revisions="