diff --git a/tests/conftest.py b/tests/conftest.py index 1f2c5c9..b5cc28f 100755 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -575,7 +575,7 @@ def buildings_free_float_single_zone_ahu_complex( boundary = Boundary(name="boundary") ahu = AirHandlingUnit( name="ahu", - template=""" {{package_name}}.Common.Fluid.Ventilation.AhuWithEconomizer {{element.name}}(redeclare + template=""" {{package_name}}.Trano.Fluid.Ventilation.AhuWithEconomizer {{element.name}}(redeclare package MediumA = Medium, VRoo={100,100}, @@ -611,7 +611,7 @@ def buildings_free_float_single_zone_ahu_complex( ], control=AhuControl( name="ahu_control", - template=""" {{package_name}}.Common.Controls.ventilation.AHU_G36 {{element.name}} + template=""" {{package_name}}.Trano.Controls.ventilation.AHU_G36 {{element.name}} annotation ( Placement(transformation(origin = {{ macros.join_list(element.position) }}, extent = {% raw %}{{-10, -10}, {10, 10}} @@ -822,12 +822,12 @@ def remove_annotation(model: str) -> str: return model -def remove_common_package(model: str) -> str: - for annotation in re.findall(r"package Common(.*?)end Common;", model, re.DOTALL): +def remove_trano_package(model: str) -> str: + for annotation in re.findall(r"package Trano(.*?)end Trano;", model, re.DOTALL): model = ( model.replace(annotation, "") - .replace("package Common", "") - .replace("end Common;", "") + .replace("package Trano", "") + .replace("end Trano;", "") ) return model @@ -837,7 +837,7 @@ def clean_model(model: str, model_name: str) -> set: path_file = Path(__file__).parent.joinpath("data", f"{model_name}.mo") with path_file.open("w") as f: f.write(model) - model = remove_common_package(model) + model = remove_trano_package(model) model_ = remove_annotation(model) return { line @@ -853,7 +853,7 @@ def _read(file_name: str) -> Set: line for line in set( remove_annotation( - remove_common_package( + remove_trano_package( Path(__file__) .parent.joinpath("data", f"{file_name}.mo") .read_text() diff --git a/tests/data/buildings_free_float_single_zone.mo b/tests/data/buildings_free_float_single_zone.mo index 967b192..4a6f8a7 100644 --- a/tests/data/buildings_free_float_single_zone.mo +++ b/tests/data/buildings_free_float_single_zone.mo @@ -1,6 +1,6 @@ package buildings_free_float_single_zone -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -405,7 +405,7 @@ constructed by the signals connected to this bus. preserveAspectRatio=false))); end AHU_G36; model OccupancyOccupancy_0 -extends buildings_free_float_single_zone.Common.Occupancy.SimpleOccupancy ; +extends buildings_free_float_single_zone.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2129,7 +2129,7 @@ end PartialVAVBox; IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; model building parameter Buildings.HeatTransfer.Data.GlazingSystems.Generic double_glazing( @@ -2224,7 +2224,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { 0, 0 }, extent = {{-20, -20}, {20, 20}} ))); - buildings_free_float_single_zone.Common.Controls.ventilation.OccupancyOccupancy_0 + buildings_free_float_single_zone.Trano.Controls.ventilation.OccupancyOccupancy_0 occupancy_0( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2239,7 +2239,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { -100, 200 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_free_float_single_zone.Common.Controls.ventilation.DataServer + buildings_free_float_single_zone.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { -188.23379566178366, -80.53383946840174 }, diff --git a/tests/data/buildings_free_float_single_zone_with_data.mo b/tests/data/buildings_free_float_single_zone_with_data.mo index 78712a0..34130b6 100644 --- a/tests/data/buildings_free_float_single_zone_with_data.mo +++ b/tests/data/buildings_free_float_single_zone_with_data.mo @@ -1,6 +1,6 @@ package buildings_free_float_single_zone_with_data -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -405,7 +405,7 @@ constructed by the signals connected to this bus. preserveAspectRatio=false))); end AHU_G36; model OccupancyOccupancy_0 -extends buildings_free_float_single_zone_with_data.Common.Occupancy.SimpleOccupancy ; +extends buildings_free_float_single_zone_with_data.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2136,7 +2136,7 @@ end PartialVAVBox; IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; model building parameter Buildings.HeatTransfer.Data.GlazingSystems.Generic double_glazing( @@ -2231,7 +2231,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { 0, 0 }, extent = {{-20, -20}, {20, 20}} ))); - buildings_free_float_single_zone_with_data.Common.Controls.ventilation.OccupancyOccupancy_0 + buildings_free_float_single_zone_with_data.Trano.Controls.ventilation.OccupancyOccupancy_0 occupancy_0( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2246,7 +2246,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { -100, 200 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_free_float_single_zone_with_data.Common.Controls.ventilation.DataServer + buildings_free_float_single_zone_with_data.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { -175.00821851028516, -124.22446399572215 }, diff --git a/tests/data/buildings_free_float_three_zones.mo b/tests/data/buildings_free_float_three_zones.mo index eb1fc32..447aafd 100644 --- a/tests/data/buildings_free_float_three_zones.mo +++ b/tests/data/buildings_free_float_three_zones.mo @@ -1,6 +1,6 @@ package buildings_free_float_three_zones -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -405,7 +405,7 @@ constructed by the signals connected to this bus. preserveAspectRatio=false))); end AHU_G36; model OccupancyOccupancy_0 -extends buildings_free_float_three_zones.Common.Occupancy.SimpleOccupancy ; +extends buildings_free_float_three_zones.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -414,7 +414,7 @@ connect(dataBus.OccupiedSpace_1, occSch2.occupied); end OccupancyOccupancy_0; model OccupancyOccupancy_1 -extends buildings_free_float_three_zones.Common.Occupancy.SimpleOccupancy ; +extends buildings_free_float_three_zones.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -423,7 +423,7 @@ connect(dataBus.OccupiedSpace_2, occSch2.occupied); end OccupancyOccupancy_1; model OccupancyOccupancy_2 -extends buildings_free_float_three_zones.Common.Occupancy.SimpleOccupancy ; +extends buildings_free_float_three_zones.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2155,7 +2155,7 @@ end PartialVAVBox; IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; model building parameter Buildings.HeatTransfer.Data.GlazingSystems.Generic double_glazing( @@ -2267,7 +2267,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { 0, 0 }, extent = {{-20, -20}, {20, 20}} ))); - buildings_free_float_three_zones.Common.Controls.ventilation.OccupancyOccupancy_0 + buildings_free_float_three_zones.Trano.Controls.ventilation.OccupancyOccupancy_0 occupancy_0( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2313,7 +2313,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { 250, 150 }, extent = {{-20, -20}, {20, 20}} ))); - buildings_free_float_three_zones.Common.Controls.ventilation.OccupancyOccupancy_1 + buildings_free_float_three_zones.Trano.Controls.ventilation.OccupancyOccupancy_1 occupancy_1( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2359,7 +2359,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { 500, 150 }, extent = {{-20, -20}, {20, 20}} ))); - buildings_free_float_three_zones.Common.Controls.ventilation.OccupancyOccupancy_2 + buildings_free_float_three_zones.Trano.Controls.ventilation.OccupancyOccupancy_2 occupancy_2( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2401,7 +2401,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { -100, 200 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_free_float_three_zones.Common.Controls.ventilation.DataServer + buildings_free_float_three_zones.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { 134.41673241227394, -158.2902907181113 }, diff --git a/tests/data/buildings_free_float_two_zones.mo b/tests/data/buildings_free_float_two_zones.mo index e85abc1..7e6c3d9 100644 --- a/tests/data/buildings_free_float_two_zones.mo +++ b/tests/data/buildings_free_float_two_zones.mo @@ -1,6 +1,6 @@ package buildings_free_float_two_zones -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -405,7 +405,7 @@ constructed by the signals connected to this bus. preserveAspectRatio=false))); end AHU_G36; model OccupancyOccupancy_0 -extends buildings_free_float_two_zones.Common.Occupancy.SimpleOccupancy ; +extends buildings_free_float_two_zones.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -414,7 +414,7 @@ connect(dataBus.OccupiedSpace_1, occSch2.occupied); end OccupancyOccupancy_0; model OccupancyOccupancy_1 -extends buildings_free_float_two_zones.Common.Occupancy.SimpleOccupancy ; +extends buildings_free_float_two_zones.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2142,7 +2142,7 @@ end PartialVAVBox; IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; model building parameter Buildings.HeatTransfer.Data.GlazingSystems.Generic double_glazing( @@ -2254,7 +2254,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { 0, 0 }, extent = {{-20, -20}, {20, 20}} ))); - buildings_free_float_two_zones.Common.Controls.ventilation.OccupancyOccupancy_0 + buildings_free_float_two_zones.Trano.Controls.ventilation.OccupancyOccupancy_0 occupancy_0( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2291,7 +2291,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { 250, 150 }, extent = {{-20, -20}, {20, 20}} ))); - buildings_free_float_two_zones.Common.Controls.ventilation.OccupancyOccupancy_1 + buildings_free_float_two_zones.Trano.Controls.ventilation.OccupancyOccupancy_1 occupancy_1( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2315,7 +2315,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { -100, 200 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_free_float_two_zones.Common.Controls.ventilation.DataServer + buildings_free_float_two_zones.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { -41.50247909072355, 190.00204552385694 }, diff --git a/tests/data/buildings_simple_hydronic.mo b/tests/data/buildings_simple_hydronic.mo index 7668f26..d1927ed 100644 --- a/tests/data/buildings_simple_hydronic.mo +++ b/tests/data/buildings_simple_hydronic.mo @@ -1,6 +1,6 @@ package buildings_simple_hydronic -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -453,7 +453,7 @@ connect(dataBus.yCooValve, emissionControl.yCoo); connect(dataBus.yHeaValve, emissionControl.yHea); end EmissionControlEmission_valve_control; model OccupancyOccupancy_0 -extends buildings_simple_hydronic.Common.Occupancy.SimpleOccupancy ; +extends buildings_simple_hydronic.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -487,7 +487,7 @@ annotation (Line(points={{10,0},{110,0}}, color={0,0,127})); connect(u, conVal. -20},{0,-16},{-2,-16},{-2,-12}}, color={0,0,127}));annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( coordinateSystem(preserveAspectRatio=false)));end ThreeWayValveControlThree_way_valve_control; model BoilerControlBoiler_control - extends buildings_simple_hydronic.Common.Controls.ventilation.PartialBoilerControl; + extends buildings_simple_hydronic.Trano.Controls.ventilation.PartialBoilerControl; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -1001,7 +1001,7 @@ end PartialBoilerWithStorage; model BoilerWithStorageBoiler - extends buildings_simple_hydronic.Common.Fluid.Boilers.PartialBoilerWithStorage; + extends buildings_simple_hydronic.Trano.Fluid.Boilers.PartialBoilerWithStorage; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2198,7 +2198,7 @@ graphics={ thickness=1)})); end PartialVAVBox; model PumpPump -extends buildings_simple_hydronic.Common.Fluid.Ventilation.PartialPump; +extends buildings_simple_hydronic.Trano.Fluid.Ventilation.PartialPump; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2295,7 +2295,7 @@ connect(dataBus.TPump_control, temSup.T); IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; model building parameter Buildings.HeatTransfer.Data.GlazingSystems.Generic double_glazing( @@ -2464,7 +2464,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 0, -75 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic.Common.Controls.ventilation.EmissionControlEmission_valve_control + buildings_simple_hydronic.Trano.Controls.ventilation.EmissionControlEmission_valve_control emission_valve_control( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -2472,7 +2472,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 126.9129205064634, 144.97590249189741 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic.Common.Controls.ventilation.OccupancyOccupancy_0 + buildings_simple_hydronic.Trano.Controls.ventilation.OccupancyOccupancy_0 occupancy_0( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2511,7 +2511,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { -200, -275 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic.Common.Controls.ventilation. + buildings_simple_hydronic.Trano.Controls.ventilation. ThreeWayValveControlThree_way_valve_control three_way_valve_control annotation ( Placement(transformation(origin = { -250, -275 }, @@ -2529,7 +2529,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 130, -175 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic.Common.Fluid.Boilers. + buildings_simple_hydronic.Trano.Fluid.Boilers. BoilerWithStorageBoiler boiler( a={0.9}, dp=5000*{2,1}, @@ -2552,7 +2552,7 @@ redeclare package MediumW = MediumW, fue = Buildings.Fluid.Data.Fuels.HeatingOil Placement(transformation(origin = { 230, -275 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic.Common.Controls.ventilation.BoilerControlBoiler_control + buildings_simple_hydronic.Trano.Controls.ventilation.BoilerControlBoiler_control boiler_control( threshold_outdoor_air_cutoff=288.15, threshold_to_switch_off_boiler=288.15, TSup_nominal=353.15 @@ -2560,7 +2560,7 @@ redeclare package MediumW = MediumW, fue = Buildings.Fluid.Data.Fuels.HeatingOil Placement(transformation(origin = { 180, -275 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic.Common. + buildings_simple_hydronic.Trano. Fluid.Ventilation.PumpPump pump( dp_nominal=10000.0, @@ -2572,12 +2572,12 @@ redeclare package MediumW = MediumW, fue = Buildings.Fluid.Data.Fuels.HeatingOil Placement(transformation(origin = { -300, -375 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic.Common.Controls.ventilation.CollectorControlPump_control + buildings_simple_hydronic.Trano.Controls.ventilation.CollectorControlPump_control pump_control annotation ( Placement(transformation(origin = { -350, -375 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic.Common.Controls.ventilation.DataServer + buildings_simple_hydronic.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { -200.0, -27.017818703044064 }, diff --git a/tests/data/buildings_simple_hydronic_three_zones.mo b/tests/data/buildings_simple_hydronic_three_zones.mo index 5e67f45..94ce538 100644 --- a/tests/data/buildings_simple_hydronic_three_zones.mo +++ b/tests/data/buildings_simple_hydronic_three_zones.mo @@ -1,6 +1,6 @@ package buildings_simple_hydronic_three_zones -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -453,7 +453,7 @@ connect(dataBus.yCooValve, emissionControl.yCoo); connect(dataBus.yHeaValve, emissionControl.yHea); end EmissionControlEmission_valve_control; model OccupancyOccupancy_0 -extends buildings_simple_hydronic_three_zones.Common.Occupancy.SimpleOccupancy ; +extends buildings_simple_hydronic_three_zones.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -510,7 +510,7 @@ connect(dataBus.yCooValve_2, emissionControl.yCoo); connect(dataBus.yHeaValve_2, emissionControl.yHea); end EmissionControlEmission_valve_control_2; model OccupancyOccupancy_1 -extends buildings_simple_hydronic_three_zones.Common.Occupancy.SimpleOccupancy ; +extends buildings_simple_hydronic_three_zones.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -567,7 +567,7 @@ connect(dataBus.yCooValve_3, emissionControl.yCoo); connect(dataBus.yHeaValve_3, emissionControl.yHea); end EmissionControlEmission_valve_control_3; model OccupancyOccupancy_2 -extends buildings_simple_hydronic_three_zones.Common.Occupancy.SimpleOccupancy ; +extends buildings_simple_hydronic_three_zones.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -626,7 +626,7 @@ annotation (Line(points={{10,0},{110,0}}, color={0,0,127})); connect(u, conVal. -20},{0,-16},{-2,-16},{-2,-12}}, color={0,0,127}));annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( coordinateSystem(preserveAspectRatio=false)));end ThreeWayValveControlThree_way_valve_control_2; model BoilerControlBoiler_control - extends buildings_simple_hydronic_three_zones.Common.Controls.ventilation.PartialBoilerControl; + extends buildings_simple_hydronic_three_zones.Trano.Controls.ventilation.PartialBoilerControl; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -1170,7 +1170,7 @@ end PartialBoilerWithStorage; model BoilerWithStorageBoiler - extends buildings_simple_hydronic_three_zones.Common.Fluid.Boilers.PartialBoilerWithStorage; + extends buildings_simple_hydronic_three_zones.Trano.Fluid.Boilers.PartialBoilerWithStorage; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2367,7 +2367,7 @@ graphics={ thickness=1)})); end PartialVAVBox; model PumpPump -extends buildings_simple_hydronic_three_zones.Common.Fluid.Ventilation.PartialPump; +extends buildings_simple_hydronic_three_zones.Trano.Fluid.Ventilation.PartialPump; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2464,7 +2464,7 @@ connect(dataBus.TPump_control, temSup.T); IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; model building parameter Buildings.HeatTransfer.Data.GlazingSystems.Generic double_glazing( @@ -2650,7 +2650,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 0, -75 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic_three_zones.Common.Controls.ventilation.EmissionControlEmission_valve_control + buildings_simple_hydronic_three_zones.Trano.Controls.ventilation.EmissionControlEmission_valve_control emission_valve_control( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -2658,7 +2658,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 123.4244137272588, -149.6620792709335 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic_three_zones.Common.Controls.ventilation.OccupancyOccupancy_0 + buildings_simple_hydronic_three_zones.Trano.Controls.ventilation.OccupancyOccupancy_0 occupancy_0( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2744,7 +2744,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 250, 75 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic_three_zones.Common.Controls.ventilation.EmissionControlEmission_valve_control_2 + buildings_simple_hydronic_three_zones.Trano.Controls.ventilation.EmissionControlEmission_valve_control_2 emission_valve_control_2( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -2752,7 +2752,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { -20.920915881289794, -186.35804430857823 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic_three_zones.Common.Controls.ventilation.OccupancyOccupancy_1 + buildings_simple_hydronic_three_zones.Trano.Controls.ventilation.OccupancyOccupancy_1 occupancy_1( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2838,7 +2838,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 500, 75 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic_three_zones.Common.Controls.ventilation.EmissionControlEmission_valve_control_3 + buildings_simple_hydronic_three_zones.Trano.Controls.ventilation.EmissionControlEmission_valve_control_3 emission_valve_control_3( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -2846,7 +2846,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 197.16850237580806, 14.322225005005567 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic_three_zones.Common.Controls.ventilation.OccupancyOccupancy_2 + buildings_simple_hydronic_three_zones.Trano.Controls.ventilation.OccupancyOccupancy_2 occupancy_2( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2912,7 +2912,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { -200, -275 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic_three_zones.Common.Controls.ventilation. + buildings_simple_hydronic_three_zones.Trano.Controls.ventilation. ThreeWayValveControlThree_way_valve_control three_way_valve_control annotation ( Placement(transformation(origin = { -250, -275 }, @@ -2942,7 +2942,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 300, -125 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic_three_zones.Common.Controls.ventilation. + buildings_simple_hydronic_three_zones.Trano.Controls.ventilation. ThreeWayValveControlThree_way_valve_control_2 three_way_valve_control_2 annotation ( Placement(transformation(origin = { 250, -125 }, @@ -2972,7 +2972,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 630, -25 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic_three_zones.Common.Fluid.Boilers. + buildings_simple_hydronic_three_zones.Trano.Fluid.Boilers. BoilerWithStorageBoiler boiler( a={0.9}, dp=5000*{2,1}, @@ -2995,7 +2995,7 @@ redeclare package MediumW = MediumW, fue = Buildings.Fluid.Data.Fuels.HeatingOil Placement(transformation(origin = { 230, -275 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic_three_zones.Common.Controls.ventilation.BoilerControlBoiler_control + buildings_simple_hydronic_three_zones.Trano.Controls.ventilation.BoilerControlBoiler_control boiler_control( threshold_outdoor_air_cutoff=288.15, threshold_to_switch_off_boiler=288.15, TSup_nominal=353.15 @@ -3003,7 +3003,7 @@ redeclare package MediumW = MediumW, fue = Buildings.Fluid.Data.Fuels.HeatingOil Placement(transformation(origin = { 180, -275 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic_three_zones.Common. + buildings_simple_hydronic_three_zones.Trano. Fluid.Ventilation.PumpPump pump( dp_nominal=10000.0, @@ -3015,12 +3015,12 @@ redeclare package MediumW = MediumW, fue = Buildings.Fluid.Data.Fuels.HeatingOil Placement(transformation(origin = { -300, -375 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic_three_zones.Common.Controls.ventilation.CollectorControlPump_control + buildings_simple_hydronic_three_zones.Trano.Controls.ventilation.CollectorControlPump_control pump_control annotation ( Placement(transformation(origin = { -350, -375 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_simple_hydronic_three_zones.Common.Controls.ventilation.DataServer + buildings_simple_hydronic_three_zones.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { -184.13929039547378, -18.960742467034816 }, diff --git a/tests/data/buildings_two_rooms_with_storage.mo b/tests/data/buildings_two_rooms_with_storage.mo index 239ffb2..e4aa5c0 100644 --- a/tests/data/buildings_two_rooms_with_storage.mo +++ b/tests/data/buildings_two_rooms_with_storage.mo @@ -1,6 +1,6 @@ package buildings_two_rooms_with_storage -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -453,7 +453,7 @@ connect(dataBus.yCooValve, emissionControl.yCoo); connect(dataBus.yHeaValve, emissionControl.yHea); end EmissionControlEmission_valve_control; model OccupancyOccupancy_0 -extends buildings_two_rooms_with_storage.Common.Occupancy.SimpleOccupancy ; +extends buildings_two_rooms_with_storage.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -510,7 +510,7 @@ connect(dataBus.yCooValve_2, emissionControl.yCoo); connect(dataBus.yHeaValve_2, emissionControl.yHea); end EmissionControlEmission_valve_control_2; model OccupancyOccupancy_1 -extends buildings_two_rooms_with_storage.Common.Occupancy.SimpleOccupancy ; +extends buildings_two_rooms_with_storage.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -582,7 +582,7 @@ annotation (Line(points={{10,0},{110,0}}, color={0,0,127})); connect(u, conVal. -20},{0,-16},{-2,-16},{-2,-12}}, color={0,0,127}));annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( coordinateSystem(preserveAspectRatio=false)));end ThreeWayValveControlThree_way_valve_control; model BoilerControlBoiler_control - extends buildings_two_rooms_with_storage.Common.Controls.ventilation.PartialBoilerControl; + extends buildings_two_rooms_with_storage.Trano.Controls.ventilation.PartialBoilerControl; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -1068,7 +1068,7 @@ end PartialBoilerWithStorage; model BoilerWithStorageBoiler - extends buildings_two_rooms_with_storage.Common.Fluid.Boilers.PartialBoilerWithStorage; + extends buildings_two_rooms_with_storage.Trano.Fluid.Boilers.PartialBoilerWithStorage; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2265,7 +2265,7 @@ graphics={ thickness=1)})); end PartialVAVBox; model PumpPump -extends buildings_two_rooms_with_storage.Common.Fluid.Ventilation.PartialPump; +extends buildings_two_rooms_with_storage.Trano.Fluid.Ventilation.PartialPump; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2362,7 +2362,7 @@ connect(dataBus.TPump_control, temSup.T); IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; model building parameter Buildings.HeatTransfer.Data.GlazingSystems.Generic double_glazing( @@ -2548,7 +2548,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 0, -75 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_two_rooms_with_storage.Common.Controls.ventilation.EmissionControlEmission_valve_control + buildings_two_rooms_with_storage.Trano.Controls.ventilation.EmissionControlEmission_valve_control emission_valve_control( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -2556,7 +2556,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { -128.78199424481667, 160.5880133525733 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_two_rooms_with_storage.Common.Controls.ventilation.OccupancyOccupancy_0 + buildings_two_rooms_with_storage.Trano.Controls.ventilation.OccupancyOccupancy_0 occupancy_0( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2642,7 +2642,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 250, 75 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_two_rooms_with_storage.Common.Controls.ventilation.EmissionControlEmission_valve_control_2 + buildings_two_rooms_with_storage.Trano.Controls.ventilation.EmissionControlEmission_valve_control_2 emission_valve_control_2( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -2650,7 +2650,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 85.68567731293153, -162.80130302409515 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_two_rooms_with_storage.Common.Controls.ventilation.OccupancyOccupancy_1 + buildings_two_rooms_with_storage.Trano.Controls.ventilation.OccupancyOccupancy_1 occupancy_1( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2692,7 +2692,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 130, -175 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_two_rooms_with_storage.Common. + buildings_two_rooms_with_storage.Trano. Fluid.Ventilation.PumpPump pump( dp_nominal=28000.0, @@ -2704,7 +2704,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { -200, -275 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_two_rooms_with_storage.Common.Controls.ventilation.CollectorControlPump_control + buildings_two_rooms_with_storage.Trano.Controls.ventilation.CollectorControlPump_control pump_control annotation ( Placement(transformation(origin = { -250, -275 }, extent = {{-10, -10}, {10, 10}} @@ -2727,13 +2727,13 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { -300, -375 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_two_rooms_with_storage.Common.Controls.ventilation. + buildings_two_rooms_with_storage.Trano.Controls.ventilation. ThreeWayValveControlThree_way_valve_control three_way_valve_control annotation ( Placement(transformation(origin = { -350, -375 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_two_rooms_with_storage.Common.Fluid.Boilers. + buildings_two_rooms_with_storage.Trano.Fluid.Boilers. BoilerWithStorageBoiler boiler( a={0.9}, dp=5000*{2,1}, @@ -2756,7 +2756,7 @@ redeclare package MediumW = MediumW, fue = Buildings.Fluid.Data.Fuels.HeatingOil Placement(transformation(origin = { -400, -475 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_two_rooms_with_storage.Common.Controls.ventilation.BoilerControlBoiler_control + buildings_two_rooms_with_storage.Trano.Controls.ventilation.BoilerControlBoiler_control boiler_control( threshold_outdoor_air_cutoff=288.15, threshold_to_switch_off_boiler=288.15, TSup_nominal=353.15 @@ -2764,7 +2764,7 @@ redeclare package MediumW = MediumW, fue = Buildings.Fluid.Data.Fuels.HeatingOil Placement(transformation(origin = { -450, -475 }, extent = {{-10, -10}, {10, 10}} ))); - buildings_two_rooms_with_storage.Common.Controls.ventilation.DataServer + buildings_two_rooms_with_storage.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { 173.0295894392272, 73.24590299938755 }, diff --git a/tests/data/house.mo b/tests/data/house.mo index efcc391..899a38b 100644 --- a/tests/data/house.mo +++ b/tests/data/house.mo @@ -1,6 +1,6 @@ package house -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -453,7 +453,7 @@ connect(dataBus.yCooSystem_008, emissionControl.yCoo); connect(dataBus.yHeaSystem_008, emissionControl.yHea); end EmissionControlControl_007; model OccupancyOccupancy_1 -extends house.Common.Occupancy.SimpleOccupancy ; +extends house.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -510,7 +510,7 @@ connect(dataBus.yCooSystem_010, emissionControl.yCoo); connect(dataBus.yHeaSystem_010, emissionControl.yHea); end EmissionControlControl_006; model OccupancyOccupancy_2 -extends house.Common.Occupancy.SimpleOccupancy ; +extends house.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -567,7 +567,7 @@ connect(dataBus.yCooSystem_012, emissionControl.yCoo); connect(dataBus.yHeaSystem_012, emissionControl.yHea); end EmissionControlControl_005; model OccupancyOccupancy_3 -extends house.Common.Occupancy.SimpleOccupancy ; +extends house.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -665,7 +665,7 @@ annotation (Line(points={{10,0},{110,0}}, color={0,0,127})); connect(u, conVal. -20},{0,-16},{-2,-16},{-2,-12}}, color={0,0,127}));annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( coordinateSystem(preserveAspectRatio=false)));end ThreeWayValveControlControl_004; model BoilerControlControl_001 - extends house.Common.Controls.ventilation.PartialBoilerControl; + extends house.Trano.Controls.ventilation.PartialBoilerControl; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -1170,7 +1170,7 @@ end PartialBoilerWithStorage; model BoilerWithStorageSystem_001 - extends house.Common.Fluid.Boilers.PartialBoilerWithStorage; + extends house.Trano.Fluid.Boilers.PartialBoilerWithStorage; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2367,7 +2367,7 @@ graphics={ thickness=1)})); end PartialVAVBox; model PumpSystem_002 -extends house.Common.Fluid.Ventilation.PartialPump; +extends house.Trano.Fluid.Ventilation.PartialPump; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2464,7 +2464,7 @@ connect(dataBus.TControl_002, temSup.T); IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; model building parameter Buildings.HeatTransfer.Data.GlazingSystems.Generic construction_011( @@ -2650,7 +2650,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 30, -75 }, extent = {{-10, -10}, {10, 10}} ))); - house.Common.Controls.ventilation.EmissionControlControl_007 + house.Trano.Controls.ventilation.EmissionControlControl_007 control_007( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -2658,7 +2658,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { -84.251063211854, -144.5018119786159 }, extent = {{-10, -10}, {10, 10}} ))); - house.Common.Controls.ventilation.OccupancyOccupancy_1 + house.Trano.Controls.ventilation.OccupancyOccupancy_1 occupancy_1( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2729,7 +2729,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 280, 75 }, extent = {{-10, -10}, {10, 10}} ))); - house.Common.Controls.ventilation.EmissionControlControl_006 + house.Trano.Controls.ventilation.EmissionControlControl_006 control_006( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=1.0 @@ -2737,7 +2737,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 144.16093143151747, 104.5017178763107 }, extent = {{-10, -10}, {10, 10}} ))); - house.Common.Controls.ventilation.OccupancyOccupancy_2 + house.Trano.Controls.ventilation.OccupancyOccupancy_2 occupancy_2( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2808,7 +2808,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 530, 75 }, extent = {{-10, -10}, {10, 10}} ))); - house.Common.Controls.ventilation.EmissionControlControl_005 + house.Trano.Controls.ventilation.EmissionControlControl_005 control_005( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=1.0 @@ -2816,7 +2816,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 5.9407460924619295, -200.0 }, extent = {{-10, -10}, {10, 10}} ))); - house.Common.Controls.ventilation.OccupancyOccupancy_3 + house.Trano.Controls.ventilation.OccupancyOccupancy_3 occupancy_3( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2858,7 +2858,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { -100, 200 }, extent = {{-10, -10}, {10, 10}} ))); - house.Common. + house.Trano. Fluid.Ventilation.PumpSystem_002 system_002( dp_nominal=10000.0, @@ -2870,7 +2870,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { -117.52316651044711, -150.83731094395173 }, extent = {{-10, -10}, {10, 10}} ))); - house.Common.Controls.ventilation.CollectorControlControl_002 + house.Trano.Controls.ventilation.CollectorControlControl_002 control_002 annotation ( Placement(transformation(origin = { 183.53300413307338, 72.31555702859998 }, extent = {{-10, -10}, {10, 10}} @@ -2893,7 +2893,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 30, -275 }, extent = {{-10, -10}, {10, 10}} ))); - house.Common.Controls.ventilation. + house.Trano.Controls.ventilation. ThreeWayValveControlControl_003 control_003 annotation ( Placement(transformation(origin = { -20, -275 }, @@ -2917,13 +2917,13 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 530, -125 }, extent = {{-10, -10}, {10, 10}} ))); - house.Common.Controls.ventilation. + house.Trano.Controls.ventilation. ThreeWayValveControlControl_004 control_004 annotation ( Placement(transformation(origin = { 480, -125 }, extent = {{-10, -10}, {10, 10}} ))); - house.Common.Fluid.Boilers. + house.Trano.Fluid.Boilers. BoilerWithStorageSystem_001 system_001( a={0.9}, dp=5000*{2,1}, @@ -2946,7 +2946,7 @@ redeclare package MediumW = MediumW, fue = Buildings.Fluid.Data.Fuels.HeatingOil Placement(transformation(origin = { 180.83344051895682, -66.05710163992785 }, extent = {{-10, -10}, {10, 10}} ))); - house.Common.Controls.ventilation.BoilerControlControl_001 + house.Trano.Controls.ventilation.BoilerControlControl_001 control_001( threshold_outdoor_air_cutoff=288.15, threshold_to_switch_off_boiler=288.15, TSup_nominal=353.15 @@ -2990,7 +2990,7 @@ redeclare package MediumW = MediumW, fue = Buildings.Fluid.Data.Fuels.HeatingOil Placement(transformation(origin = { 400, -25 }, extent = {{-10, -10}, {10, 10}} ))); - house.Common.Controls.ventilation.DataServer + house.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { -182.42342299526456, -28.379988966115587 }, diff --git a/tests/data/house_model.mo b/tests/data/house_model.mo index 6bdeb17..1f1d3c2 100644 --- a/tests/data/house_model.mo +++ b/tests/data/house_model.mo @@ -1,6 +1,6 @@ package house_model -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -453,7 +453,7 @@ connect(dataBus.yCooValve_2, emissionControl.yCoo); connect(dataBus.yHeaValve_2, emissionControl.yHea); end EmissionControlEmissioncontrol_2; model OccupancyOccupancy_2 -extends house_model.Common.Occupancy.SimpleOccupancy ; +extends house_model.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -510,7 +510,7 @@ connect(dataBus.yCooValve_1, emissionControl.yCoo); connect(dataBus.yHeaValve_1, emissionControl.yHea); end EmissionControlEmissioncontrol_1; model OccupancyOccupancy_1 -extends house_model.Common.Occupancy.SimpleOccupancy ; +extends house_model.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -567,7 +567,7 @@ connect(dataBus.yCooValve_0, emissionControl.yCoo); connect(dataBus.yHeaValve_0, emissionControl.yHea); end EmissionControlEmissioncontrol_0; model OccupancyOccupancy_0 -extends house_model.Common.Occupancy.SimpleOccupancy ; +extends house_model.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -624,7 +624,7 @@ connect(dataBus.yCooValve_5, emissionControl.yCoo); connect(dataBus.yHeaValve_5, emissionControl.yHea); end EmissionControlEmissioncontrol_5; model OccupancyOccupancy_5 -extends house_model.Common.Occupancy.SimpleOccupancy ; +extends house_model.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -681,7 +681,7 @@ connect(dataBus.yCooValve_6, emissionControl.yCoo); connect(dataBus.yHeaValve_6, emissionControl.yHea); end EmissionControlEmissioncontrol_6; model OccupancyOccupancy_8 -extends house_model.Common.Occupancy.SimpleOccupancy ; +extends house_model.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -690,7 +690,7 @@ connect(dataBus.OccupiedSpace_9, occSch2.occupied); end OccupancyOccupancy_8; model OccupancyOccupancy_6 -extends house_model.Common.Occupancy.SimpleOccupancy ; +extends house_model.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -699,7 +699,7 @@ connect(dataBus.OccupiedSpace_7, occSch2.occupied); end OccupancyOccupancy_6; model OccupancyOccupancy_7 -extends house_model.Common.Occupancy.SimpleOccupancy ; +extends house_model.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -756,7 +756,7 @@ connect(dataBus.yCooValve_7, emissionControl.yCoo); connect(dataBus.yHeaValve_7, emissionControl.yHea); end EmissionControlEmissioncontrol_7; model OccupancyOccupancy_9 -extends house_model.Common.Occupancy.SimpleOccupancy ; +extends house_model.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -765,7 +765,7 @@ connect(dataBus.OccupiedSpace_10, occSch2.occupied); end OccupancyOccupancy_9; model OccupancyOccupancy_10 -extends house_model.Common.Occupancy.SimpleOccupancy ; +extends house_model.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -822,7 +822,7 @@ connect(dataBus.yCooValve_4, emissionControl.yCoo); connect(dataBus.yHeaValve_4, emissionControl.yHea); end EmissionControlEmissioncontrol_4; model OccupancyOccupancy_4 -extends house_model.Common.Occupancy.SimpleOccupancy ; +extends house_model.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -879,7 +879,7 @@ connect(dataBus.yCooValve_3, emissionControl.yCoo); connect(dataBus.yHeaValve_3, emissionControl.yHea); end EmissionControlEmissioncontrol_3; model OccupancyOccupancy_3 -extends house_model.Common.Occupancy.SimpleOccupancy ; +extends house_model.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -1540,7 +1540,7 @@ end PartialBoilerWithStorage; model BoilerWithStorageBoiler_0 - extends house_model.Common.Fluid.Boilers.PartialBoilerWithStorage; + extends house_model.Trano.Fluid.Boilers.PartialBoilerWithStorage; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2737,7 +2737,7 @@ graphics={ thickness=1)})); end PartialVAVBox; model PumpPump_0 -extends house_model.Common.Fluid.Ventilation.PartialPump; +extends house_model.Trano.Fluid.Ventilation.PartialPump; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2834,7 +2834,7 @@ connect(dataBus.TCollectorcontrol_0, temSup.T); IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; model building parameter Buildings.HeatTransfer.Data.GlazingSystems.Generic simple_glazing( @@ -3101,7 +3101,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 0, -75 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation.EmissionControlEmissioncontrol_2 + house_model.Trano.Controls.ventilation.EmissionControlEmissioncontrol_2 emissioncontrol_2( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -3109,7 +3109,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { -92.92902507988946, -167.86783037659794 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation.OccupancyOccupancy_2 + house_model.Trano.Controls.ventilation.OccupancyOccupancy_2 occupancy_2( gain=[35; 70; 30], k=0.15, occupancy=3600*{0.1,2,15,24} @@ -3186,7 +3186,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 250, 75 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation.EmissionControlEmissioncontrol_1 + house_model.Trano.Controls.ventilation.EmissionControlEmissioncontrol_1 emissioncontrol_1( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -3194,7 +3194,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 189.7265709622246, -64.32438997573396 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation.OccupancyOccupancy_1 + house_model.Trano.Controls.ventilation.OccupancyOccupancy_1 occupancy_1( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -3274,7 +3274,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 500, 75 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation.EmissionControlEmissioncontrol_0 + house_model.Trano.Controls.ventilation.EmissionControlEmissioncontrol_0 emissioncontrol_0( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -3282,7 +3282,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { -2.231794320417694, 170.4697417704844 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation.OccupancyOccupancy_0 + house_model.Trano.Controls.ventilation.OccupancyOccupancy_0 occupancy_0( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -3353,7 +3353,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 0, 75 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation.EmissionControlEmissioncontrol_5 + house_model.Trano.Controls.ventilation.EmissionControlEmissioncontrol_5 emissioncontrol_5( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -3361,7 +3361,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 169.25276956557062, -96.84115965995568 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation.OccupancyOccupancy_5 + house_model.Trano.Controls.ventilation.OccupancyOccupancy_5 occupancy_5( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -3441,7 +3441,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 250, 225 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation.EmissionControlEmissioncontrol_6 + house_model.Trano.Controls.ventilation.EmissionControlEmissioncontrol_6 emissioncontrol_6( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -3449,7 +3449,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 172.7013428572128, 117.20900341039652 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation.OccupancyOccupancy_8 + house_model.Trano.Controls.ventilation.OccupancyOccupancy_8 occupancy_8( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -3480,7 +3480,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 500, 300 }, extent = {{-20, -20}, {20, 20}} ))); - house_model.Common.Controls.ventilation.OccupancyOccupancy_6 + house_model.Trano.Controls.ventilation.OccupancyOccupancy_6 occupancy_6( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -3511,7 +3511,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 0, 300 }, extent = {{-20, -20}, {20, 20}} ))); - house_model.Common.Controls.ventilation.OccupancyOccupancy_7 + house_model.Trano.Controls.ventilation.OccupancyOccupancy_7 occupancy_7( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -3582,7 +3582,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 250, 375 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation.EmissionControlEmissioncontrol_7 + house_model.Trano.Controls.ventilation.EmissionControlEmissioncontrol_7 emissioncontrol_7( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -3590,7 +3590,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { -156.98718998259216, 123.42832385268737 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation.OccupancyOccupancy_9 + house_model.Trano.Controls.ventilation.OccupancyOccupancy_9 occupancy_9( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -3617,7 +3617,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 500, 450 }, extent = {{-20, -20}, {20, 20}} ))); - house_model.Common.Controls.ventilation.OccupancyOccupancy_10 + house_model.Trano.Controls.ventilation.OccupancyOccupancy_10 occupancy_10( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -3703,7 +3703,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 0, 375 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation.EmissionControlEmissioncontrol_4 + house_model.Trano.Controls.ventilation.EmissionControlEmissioncontrol_4 emissioncontrol_4( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -3711,7 +3711,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 168.45320014508494, -114.1947053975066 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation.OccupancyOccupancy_4 + house_model.Trano.Controls.ventilation.OccupancyOccupancy_4 occupancy_4( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -3797,7 +3797,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 250, 525 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation.EmissionControlEmissioncontrol_3 + house_model.Trano.Controls.ventilation.EmissionControlEmissioncontrol_3 emissioncontrol_3( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -3805,7 +3805,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { -75.00321459675324, 191.50543569425912 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation.OccupancyOccupancy_3 + house_model.Trano.Controls.ventilation.OccupancyOccupancy_3 occupancy_3( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{9, 12, 17,22} @@ -3973,7 +3973,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 130, -175 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common. + house_model.Trano. Fluid.Ventilation.PumpPump_0 pump_0( dp_nominal=10000.0, @@ -3985,7 +3985,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { -200, -275 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation.CollectorControlCollectorcontrol_0 + house_model.Trano.Controls.ventilation.CollectorControlCollectorcontrol_0 collectorcontrol_0 annotation ( Placement(transformation(origin = { -250, -275 }, extent = {{-10, -10}, {10, 10}} @@ -4008,13 +4008,13 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { -300, -375 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation. + house_model.Trano.Controls.ventilation. ThreeWayValveControlThreewayvalvecontrol_0 threewayvalvecontrol_0 annotation ( Placement(transformation(origin = { -350, -375 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Fluid.Boilers. + house_model.Trano.Fluid.Boilers. BoilerWithStorageBoiler_0 boiler_0( a={0.9}, dp=5000*{2,1}, @@ -4037,12 +4037,12 @@ redeclare package MediumW = MediumW, fue = Buildings.Fluid.Data.Fuels.HeatingOil Placement(transformation(origin = { -400, -475 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation.CollectorControlCollectorcontrol_1 + house_model.Trano.Controls.ventilation.CollectorControlCollectorcontrol_1 collectorcontrol_1 annotation ( Placement(transformation(origin = { -450, -475 }, extent = {{-10, -10}, {10, 10}} ))); - house_model.Common.Controls.ventilation.DataServer + house_model.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { -108.78152919055792, -167.32323861485887 }, diff --git a/tests/data/ideas_free_float_single_zone.mo b/tests/data/ideas_free_float_single_zone.mo index 50f0e0d..56ba36d 100644 --- a/tests/data/ideas_free_float_single_zone.mo +++ b/tests/data/ideas_free_float_single_zone.mo @@ -1,6 +1,6 @@ package ideas_free_float_single_zone -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -2120,7 +2120,7 @@ end PartialVAVBox; IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; package Data "Data for transient thermal building simulation" extends Modelica.Icons.MaterialPropertiesPackage; @@ -2258,7 +2258,7 @@ annotation (Placement(transformation(extent={{-96,76},{-76,96}}))); annotati Placement(transformation(origin = { -100, 200 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_free_float_single_zone.Common.Controls.ventilation.DataServer + ideas_free_float_single_zone.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { 195.40580130403276, 60.91937436476455 }, diff --git a/tests/data/ideas_free_float_three_zones.mo b/tests/data/ideas_free_float_three_zones.mo index cac4587..7143f26 100644 --- a/tests/data/ideas_free_float_three_zones.mo +++ b/tests/data/ideas_free_float_three_zones.mo @@ -1,6 +1,6 @@ package ideas_free_float_three_zones -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -2128,7 +2128,7 @@ end PartialVAVBox; IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; package Data "Data for transient thermal building simulation" extends Modelica.Icons.MaterialPropertiesPackage; @@ -2393,7 +2393,7 @@ annotation (Placement(transformation(extent={{-96,76},{-76,96}}))); annotati Placement(transformation(origin = { -100, 200 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_free_float_three_zones.Common.Controls.ventilation.DataServer + ideas_free_float_three_zones.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { -143.54217300279115, -111.75600461733497 }, diff --git a/tests/data/ideas_simple_hydronic_no_occupancy.mo b/tests/data/ideas_simple_hydronic_no_occupancy.mo index d270d93..0399b9f 100644 --- a/tests/data/ideas_simple_hydronic_no_occupancy.mo +++ b/tests/data/ideas_simple_hydronic_no_occupancy.mo @@ -1,6 +1,6 @@ package ideas_simple_hydronic_no_occupancy -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -478,7 +478,7 @@ annotation (Line(points={{10,0},{110,0}}, color={0,0,127})); connect(u, conVal. -20},{0,-16},{-2,-16},{-2,-12}}, color={0,0,127}));annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( coordinateSystem(preserveAspectRatio=false)));end ThreeWayValveControlThree_way_valve_control; model BoilerControlBoiler_control - extends ideas_simple_hydronic_no_occupancy.Common.Controls.ventilation.PartialBoilerControl; + extends ideas_simple_hydronic_no_occupancy.Trano.Controls.ventilation.PartialBoilerControl; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -992,7 +992,7 @@ end PartialBoilerWithStorage; model BoilerWithStorageBoiler - extends ideas_simple_hydronic_no_occupancy.Common.Fluid.Boilers.PartialBoilerWithStorage; + extends ideas_simple_hydronic_no_occupancy.Trano.Fluid.Boilers.PartialBoilerWithStorage; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2189,7 +2189,7 @@ graphics={ thickness=1)})); end PartialVAVBox; model PumpPump -extends ideas_simple_hydronic_no_occupancy.Common.Fluid.Ventilation.PartialPump; +extends ideas_simple_hydronic_no_occupancy.Trano.Fluid.Ventilation.PartialPump; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2286,7 +2286,7 @@ connect(dataBus.TPump_control, temSup.T); IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; package Data "Data for transient thermal building simulation" extends Modelica.Icons.MaterialPropertiesPackage; @@ -2491,7 +2491,7 @@ package MediumW = IDEAS.Media.Water "Medium model"; Placement(transformation(origin = { 0, -75 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_no_occupancy.Common.Controls.ventilation.EmissionControlEmission_control + ideas_simple_hydronic_no_occupancy.Trano.Controls.ventilation.EmissionControlEmission_control emission_control( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -2531,7 +2531,7 @@ annotation (Placement(transformation(extent={{-96,76},{-76,96}}))); annotati Placement(transformation(origin = { -200, -275 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_no_occupancy.Common.Controls.ventilation. + ideas_simple_hydronic_no_occupancy.Trano.Controls.ventilation. ThreeWayValveControlThree_way_valve_control three_way_valve_control annotation ( Placement(transformation(origin = { -250, -275 }, @@ -2549,7 +2549,7 @@ annotation (Placement(transformation(extent={{-96,76},{-76,96}}))); annotati Placement(transformation(origin = { 130, -175 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_no_occupancy.Common.Fluid.Boilers. + ideas_simple_hydronic_no_occupancy.Trano.Fluid.Boilers. BoilerWithStorageBoiler boiler( a={0.9}, dp=5000*{2,1}, @@ -2572,7 +2572,7 @@ redeclare package MediumW = MediumW, fue = Buildings.Fluid.Data.Fuels.HeatingOil Placement(transformation(origin = { 230, -275 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_no_occupancy.Common.Controls.ventilation.BoilerControlBoiler_control + ideas_simple_hydronic_no_occupancy.Trano.Controls.ventilation.BoilerControlBoiler_control boiler_control( threshold_outdoor_air_cutoff=288.15, threshold_to_switch_off_boiler=288.15, TSup_nominal=353.15 @@ -2580,7 +2580,7 @@ redeclare package MediumW = MediumW, fue = Buildings.Fluid.Data.Fuels.HeatingOil Placement(transformation(origin = { 180, -275 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_no_occupancy.Common. + ideas_simple_hydronic_no_occupancy.Trano. Fluid.Ventilation.PumpPump pump( dp_nominal=10000.0, @@ -2592,12 +2592,12 @@ redeclare package MediumW = MediumW, fue = Buildings.Fluid.Data.Fuels.HeatingOil Placement(transformation(origin = { -300, -375 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_no_occupancy.Common.Controls.ventilation.CollectorControlPump_control + ideas_simple_hydronic_no_occupancy.Trano.Controls.ventilation.CollectorControlPump_control pump_control annotation ( Placement(transformation(origin = { -350, -375 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_no_occupancy.Common.Controls.ventilation.DataServer + ideas_simple_hydronic_no_occupancy.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { -144.31439825323838, 157.1839487377254 }, diff --git a/tests/data/ideas_simple_hydronic_three_zones.mo b/tests/data/ideas_simple_hydronic_three_zones.mo index 8a06a2c..c1cccb0 100644 --- a/tests/data/ideas_simple_hydronic_three_zones.mo +++ b/tests/data/ideas_simple_hydronic_three_zones.mo @@ -1,6 +1,6 @@ package ideas_simple_hydronic_three_zones -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -453,7 +453,7 @@ connect(dataBus.yCooValve, emissionControl.yCoo); connect(dataBus.yHeaValve, emissionControl.yHea); end EmissionControlEmission_valve_control; model OccupancyOccupancy_0 -extends ideas_simple_hydronic_three_zones.Common.Occupancy.SimpleOccupancy ; +extends ideas_simple_hydronic_three_zones.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -510,7 +510,7 @@ connect(dataBus.yCooValve_2, emissionControl.yCoo); connect(dataBus.yHeaValve_2, emissionControl.yHea); end EmissionControlEmission_valve_control_2; model OccupancyOccupancy_1 -extends ideas_simple_hydronic_three_zones.Common.Occupancy.SimpleOccupancy ; +extends ideas_simple_hydronic_three_zones.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -567,7 +567,7 @@ connect(dataBus.yCooValve_3, emissionControl.yCoo); connect(dataBus.yHeaValve_3, emissionControl.yHea); end EmissionControlEmission_valve_control_3; model OccupancyOccupancy_2 -extends ideas_simple_hydronic_three_zones.Common.Occupancy.SimpleOccupancy ; +extends ideas_simple_hydronic_three_zones.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -626,7 +626,7 @@ annotation (Line(points={{10,0},{110,0}}, color={0,0,127})); connect(u, conVal. -20},{0,-16},{-2,-16},{-2,-12}}, color={0,0,127}));annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( coordinateSystem(preserveAspectRatio=false)));end ThreeWayValveControlThree_way_valve_control_2; model BoilerControlBoilercontrol - extends ideas_simple_hydronic_three_zones.Common.Controls.ventilation.PartialBoilerControl; + extends ideas_simple_hydronic_three_zones.Trano.Controls.ventilation.PartialBoilerControl; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -1170,7 +1170,7 @@ end PartialBoilerWithStorage; model BoilerWithStorageBoiler - extends ideas_simple_hydronic_three_zones.Common.Fluid.Boilers.PartialBoilerWithStorage; + extends ideas_simple_hydronic_three_zones.Trano.Fluid.Boilers.PartialBoilerWithStorage; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2367,7 +2367,7 @@ graphics={ thickness=1)})); end PartialVAVBox; model PumpPump -extends ideas_simple_hydronic_three_zones.Common.Fluid.Ventilation.PartialPump; +extends ideas_simple_hydronic_three_zones.Trano.Fluid.Ventilation.PartialPump; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2464,7 +2464,7 @@ connect(dataBus.TPump_control, temSup.T); IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; package Data "Data for transient thermal building simulation" extends Modelica.Icons.MaterialPropertiesPackage; @@ -2679,7 +2679,7 @@ package MediumW = IDEAS.Media.Water "Medium model"; Placement(transformation(origin = { 0, -75 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_three_zones.Common.Controls.ventilation.EmissionControlEmission_valve_control + ideas_simple_hydronic_three_zones.Trano.Controls.ventilation.EmissionControlEmission_valve_control emission_valve_control( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -2687,7 +2687,7 @@ package MediumW = IDEAS.Media.Water "Medium model"; Placement(transformation(origin = { -99.16065552937704, -163.72064829740407 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_three_zones.Common.Controls.ventilation.OccupancyOccupancy_0 + ideas_simple_hydronic_three_zones.Trano.Controls.ventilation.OccupancyOccupancy_0 occupancy_0( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2777,7 +2777,7 @@ package MediumW = IDEAS.Media.Water "Medium model"; Placement(transformation(origin = { 250, 75 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_three_zones.Common.Controls.ventilation.EmissionControlEmission_valve_control_2 + ideas_simple_hydronic_three_zones.Trano.Controls.ventilation.EmissionControlEmission_valve_control_2 emission_valve_control_2( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -2785,7 +2785,7 @@ package MediumW = IDEAS.Media.Water "Medium model"; Placement(transformation(origin = { -15.474936654570595, -196.07102151835628 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_three_zones.Common.Controls.ventilation.OccupancyOccupancy_1 + ideas_simple_hydronic_three_zones.Trano.Controls.ventilation.OccupancyOccupancy_1 occupancy_1( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2875,7 +2875,7 @@ package MediumW = IDEAS.Media.Water "Medium model"; Placement(transformation(origin = { 500, 75 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_three_zones.Common.Controls.ventilation.EmissionControlEmission_valve_control_3 + ideas_simple_hydronic_three_zones.Trano.Controls.ventilation.EmissionControlEmission_valve_control_3 emission_valve_control_3( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -2883,7 +2883,7 @@ package MediumW = IDEAS.Media.Water "Medium model"; Placement(transformation(origin = { 189.85225610856222, -72.26126355802444 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_three_zones.Common.Controls.ventilation.OccupancyOccupancy_2 + ideas_simple_hydronic_three_zones.Trano.Controls.ventilation.OccupancyOccupancy_2 occupancy_2( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2956,7 +2956,7 @@ annotation (Placement(transformation(extent={{-96,76},{-76,96}}))); annotati Placement(transformation(origin = { -200, -275 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_three_zones.Common.Controls.ventilation. + ideas_simple_hydronic_three_zones.Trano.Controls.ventilation. ThreeWayValveControlThree_way_valve_control three_way_valve_control annotation ( Placement(transformation(origin = { -250, -275 }, @@ -2986,7 +2986,7 @@ annotation (Placement(transformation(extent={{-96,76},{-76,96}}))); annotati Placement(transformation(origin = { 300, -125 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_three_zones.Common.Controls.ventilation. + ideas_simple_hydronic_three_zones.Trano.Controls.ventilation. ThreeWayValveControlThree_way_valve_control_2 three_way_valve_control_2 annotation ( Placement(transformation(origin = { 250, -125 }, @@ -3016,7 +3016,7 @@ annotation (Placement(transformation(extent={{-96,76},{-76,96}}))); annotati Placement(transformation(origin = { 630, -25 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_three_zones.Common.Fluid.Boilers. + ideas_simple_hydronic_three_zones.Trano.Fluid.Boilers. BoilerWithStorageBoiler boiler( a={0.9}, dp=5000*{2,1}, @@ -3039,7 +3039,7 @@ redeclare package MediumW = MediumW, fue = Buildings.Fluid.Data.Fuels.HeatingOil Placement(transformation(origin = { 230, -275 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_three_zones.Common.Controls.ventilation.BoilerControlBoilercontrol + ideas_simple_hydronic_three_zones.Trano.Controls.ventilation.BoilerControlBoilercontrol BoilerControl( threshold_outdoor_air_cutoff=288.15, threshold_to_switch_off_boiler=288.15, TSup_nominal=353.15 @@ -3047,7 +3047,7 @@ redeclare package MediumW = MediumW, fue = Buildings.Fluid.Data.Fuels.HeatingOil Placement(transformation(origin = { 180, -275 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_three_zones.Common. + ideas_simple_hydronic_three_zones.Trano. Fluid.Ventilation.PumpPump pump( dp_nominal=10000.0, @@ -3059,12 +3059,12 @@ redeclare package MediumW = MediumW, fue = Buildings.Fluid.Data.Fuels.HeatingOil Placement(transformation(origin = { -300, -375 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_three_zones.Common.Controls.ventilation.CollectorControlPump_control + ideas_simple_hydronic_three_zones.Trano.Controls.ventilation.CollectorControlPump_control pump_control annotation ( Placement(transformation(origin = { -350, -375 }, extent = {{-10, -10}, {10, 10}} ))); - ideas_simple_hydronic_three_zones.Common.Controls.ventilation.DataServer + ideas_simple_hydronic_three_zones.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { -176.8429137610477, 103.85061126508865 }, diff --git a/tests/data/many_spaces_simple_ventilation_with_validated_control.mo b/tests/data/many_spaces_simple_ventilation_with_validated_control.mo index 0324d73..325077b 100644 --- a/tests/data/many_spaces_simple_ventilation_with_validated_control.mo +++ b/tests/data/many_spaces_simple_ventilation_with_validated_control.mo @@ -1,7 +1,7 @@ within ; package many_spaces_simple_ventilation_with_validated_control -package Common +package Trano package Occupancy model SimpleOccupancy @@ -113,7 +113,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -155,7 +155,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -1321,7 +1321,7 @@ constructed by the signals connected to this bus. model VAVBoxVav_in_1 extends - many_spaces_simple_ventilation_with_validated_control.Common.Fluid.Ventilation.PartialVAVBox; + many_spaces_simple_ventilation_with_validated_control.Trano.Fluid.Ventilation.PartialVAVBox; Controls.BaseClasses.DataBus dataBus annotation (Placement( transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-368,-4},{-348, @@ -1364,7 +1364,7 @@ constructed by the signals connected to this bus. model VAVBoxVav_in_2 extends - many_spaces_simple_ventilation_with_validated_control.Common.Fluid.Ventilation.PartialVAVBox; + many_spaces_simple_ventilation_with_validated_control.Trano.Fluid.Ventilation.PartialVAVBox; Controls.BaseClasses.DataBus dataBus annotation (Placement( transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-368,-4},{-348, @@ -1490,7 +1490,7 @@ constructed by the signals connected to this bus. IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; model building parameter Buildings.HeatTransfer.Data.GlazingSystems.Generic double_glazing( @@ -1592,10 +1592,10 @@ package Medium = Buildings.Media.Air(extraPropertiesNames={"CO2"}) "Medium model energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) annotation ( Placement(transformation(origin = { 0, 50}, extent = {{-10, -10}, {10, 10}}))); - many_spaces_simple_ventilation_with_validated_control.Common.Occupancy.SimpleOccupancy occupancy_0 annotation ( + many_spaces_simple_ventilation_with_validated_control.Trano.Occupancy.SimpleOccupancy occupancy_0 annotation ( Placement(transformation(origin = { -50, 50}, extent = {{-10, -10}, {10, 10}}))); - many_spaces_simple_ventilation_with_validated_control.Common.Fluid.Ventilation.VAVBoxVav_in_1 + many_spaces_simple_ventilation_with_validated_control.Trano.Fluid.Ventilation.VAVBoxVav_in_1 vav_in_1( redeclare package MediumA = Medium, mCooAir_flow_nominal=100*1.2/3600, @@ -1640,10 +1640,10 @@ package Medium = Buildings.Media.Air(extraPropertiesNames={"CO2"}) "Medium model energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) annotation ( Placement(transformation(origin = { 200, 50}, extent = {{-10, -10}, {10, 10}}))); - many_spaces_simple_ventilation_with_validated_control.Common.Occupancy.SimpleOccupancy occupancy_1 annotation ( + many_spaces_simple_ventilation_with_validated_control.Trano.Occupancy.SimpleOccupancy occupancy_1 annotation ( Placement(transformation(origin = { 150, 50}, extent = {{-10, -10}, {10, 10}}))); - many_spaces_simple_ventilation_with_validated_control.Common.Fluid.Ventilation.VAVBoxVav_in_2 + many_spaces_simple_ventilation_with_validated_control.Trano.Fluid.Ventilation.VAVBoxVav_in_2 vav_in_2( redeclare package MediumA = Medium, mCooAir_flow_nominal=100*1.2/3600, @@ -1671,12 +1671,12 @@ package Medium = Buildings.Media.Air(extraPropertiesNames={"CO2"}) "Medium model annotation ( Placement(transformation(origin = { -100, 200}, extent = {{-10, -10}, {10, 10}}))); - many_spaces_simple_ventilation_with_validated_control.Common.Fluid.Ventilation.SimpleHVACBuildings + many_spaces_simple_ventilation_with_validated_control.Trano.Fluid.Ventilation.SimpleHVACBuildings ahu( redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { 100, -50}, extent = {{-10, -10}, {10, 10}}))); - many_spaces_simple_ventilation_with_validated_control.Common.Controls.SpaceControls.DataServer + many_spaces_simple_ventilation_with_validated_control.Trano.Controls.SpaceControls.DataServer data_bus( redeclare package Medium = Medium) annotation ( Placement(transformation(origin={19.8297,181.103}, diff --git a/tests/data/multiple_internal_walls_buildings.mo b/tests/data/multiple_internal_walls_buildings.mo index dcd481c..450e9f1 100644 --- a/tests/data/multiple_internal_walls_buildings.mo +++ b/tests/data/multiple_internal_walls_buildings.mo @@ -1,6 +1,6 @@ package multiple_internal_walls_buildings -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -405,7 +405,7 @@ constructed by the signals connected to this bus. preserveAspectRatio=false))); end AHU_G36; model OccupancyOccupancy_0 -extends multiple_internal_walls_buildings.Common.Occupancy.SimpleOccupancy ; +extends multiple_internal_walls_buildings.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -414,7 +414,7 @@ connect(dataBus.OccupiedSpace_1, occSch2.occupied); end OccupancyOccupancy_0; model OccupancyOccupancy_1 -extends multiple_internal_walls_buildings.Common.Occupancy.SimpleOccupancy ; +extends multiple_internal_walls_buildings.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2142,7 +2142,7 @@ end PartialVAVBox; IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; model building parameter Buildings.HeatTransfer.Data.OpaqueConstructions.Generic @@ -2255,7 +2255,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 0, 0 }, extent = {{-20, -20}, {20, 20}} ))); - multiple_internal_walls_buildings.Common.Controls.ventilation.OccupancyOccupancy_0 + multiple_internal_walls_buildings.Trano.Controls.ventilation.OccupancyOccupancy_0 occupancy_0( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2286,7 +2286,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 250, 150 }, extent = {{-20, -20}, {20, 20}} ))); - multiple_internal_walls_buildings.Common.Controls.ventilation.OccupancyOccupancy_1 + multiple_internal_walls_buildings.Trano.Controls.ventilation.OccupancyOccupancy_1 occupancy_1( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2319,7 +2319,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 125.0, 0 }, extent = {{-10, -10}, {10, 10}} ))); - multiple_internal_walls_buildings.Common.Controls.ventilation.DataServer + multiple_internal_walls_buildings.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { -182.90144634224382, -41.018162184125416 }, diff --git a/tests/data/multiple_internal_walls_ideas.mo b/tests/data/multiple_internal_walls_ideas.mo index b2a5c84..ad8446c 100644 --- a/tests/data/multiple_internal_walls_ideas.mo +++ b/tests/data/multiple_internal_walls_ideas.mo @@ -1,6 +1,6 @@ package multiple_internal_walls_ideas -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -405,7 +405,7 @@ constructed by the signals connected to this bus. preserveAspectRatio=false))); end AHU_G36; model OccupancyOccupancy_0 -extends multiple_internal_walls_ideas.Common.Occupancy.SimpleOccupancy ; +extends multiple_internal_walls_ideas.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -414,7 +414,7 @@ connect(dataBus.OccupiedSpace_1, occSch2.occupied); end OccupancyOccupancy_0; model OccupancyOccupancy_1 -extends multiple_internal_walls_ideas.Common.Occupancy.SimpleOccupancy ; +extends multiple_internal_walls_ideas.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2142,7 +2142,7 @@ end PartialVAVBox; IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; package Data "Data for transient thermal building simulation" extends Modelica.Icons.MaterialPropertiesPackage; @@ -2265,7 +2265,7 @@ package MediumW = IDEAS.Media.Water "Medium model"; Placement(transformation(origin = { -36.074480204531966, -126.5591340675001 }, extent = {{-10, -10}, {10, 10}} ))); - multiple_internal_walls_ideas.Common.Controls.ventilation.OccupancyOccupancy_0 + multiple_internal_walls_ideas.Trano.Controls.ventilation.OccupancyOccupancy_0 occupancy_0( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2296,7 +2296,7 @@ package MediumW = IDEAS.Media.Water "Medium model"; Placement(transformation(origin = { -170.31427318713654, 68.23834464153917 }, extent = {{-10, -10}, {10, 10}} ))); - multiple_internal_walls_ideas.Common.Controls.ventilation.OccupancyOccupancy_1 + multiple_internal_walls_ideas.Trano.Controls.ventilation.OccupancyOccupancy_1 occupancy_1( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2334,7 +2334,7 @@ annotation (Placement(transformation(extent={{-96,76},{-76,96}}))); annotati Placement(transformation(origin = { 125.0, 0 }, extent = {{-10, -10}, {10, 10}} ))); - multiple_internal_walls_ideas.Common.Controls.ventilation.DataServer + multiple_internal_walls_ideas.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { 4.25348330279556, 200.0 }, diff --git a/tests/data/one_spaces_air_handling_unit.mo b/tests/data/one_spaces_air_handling_unit.mo index cc9849f..1a92d04 100644 --- a/tests/data/one_spaces_air_handling_unit.mo +++ b/tests/data/one_spaces_air_handling_unit.mo @@ -1,6 +1,6 @@ package one_spaces_air_handling_unit -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -405,7 +405,7 @@ constructed by the signals connected to this bus. preserveAspectRatio=false))); end AHU_G36; model OccupancyOccupancy_0 -extends one_spaces_air_handling_unit.Common.Occupancy.SimpleOccupancy ; +extends one_spaces_air_handling_unit.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2246,7 +2246,7 @@ graphics={ thickness=1)})); end PartialVAVBox; model VAVBoxVav_in -extends one_spaces_air_handling_unit.Common.Fluid.Ventilation.PartialVAVBox; +extends one_spaces_air_handling_unit.Trano.Fluid.Ventilation.PartialVAVBox; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2258,7 +2258,7 @@ connect(dataBus.TDisVav_in_control, senTem.T); end VAVBoxVav_in; model AhuAhu - extends one_spaces_air_handling_unit.Common.Fluid.Ventilation.PartialAhu; + extends one_spaces_air_handling_unit.Trano.Fluid.Ventilation.PartialAhu; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2363,7 +2363,7 @@ connect(dataBus.dpDucAhu_control, dpDisSupFan.p_rel); IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; model building parameter Buildings.HeatTransfer.Data.GlazingSystems.Generic double_glazing( @@ -2458,7 +2458,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { 0, 0 }, extent = {{-20, -20}, {20, 20}} ))); - one_spaces_air_handling_unit.Common.Controls.ventilation.OccupancyOccupancy_0 + one_spaces_air_handling_unit.Trano.Controls.ventilation.OccupancyOccupancy_0 occupancy_0( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2466,7 +2466,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { -50, 0 }, extent = {{-10, -10}, {10, 10}} ))); - one_spaces_air_handling_unit.Common. + one_spaces_air_handling_unit.Trano. Fluid.Ventilation.VAVBoxVav_in vav_in( redeclare package MediumA = Medium, @@ -2482,7 +2482,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { 29.243179385270512, -200.0 }, extent = {{-10, -10}, {10, 10}} ))); - one_spaces_air_handling_unit.Common.Controls.ventilation.VAVControlVav_in_control + one_spaces_air_handling_unit.Trano.Controls.ventilation.VAVControlVav_in_control vav_in_control annotation ( Placement(transformation(origin = { 80.96229563419169, 182.0513229501259 }, extent = {{-10, -10}, {10, 10}} @@ -2512,7 +2512,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { -100, 200 }, extent = {{-10, -10}, {10, 10}} ))); - one_spaces_air_handling_unit.Common.Fluid. + one_spaces_air_handling_unit.Trano.Fluid. Ventilation.AhuAhu ahu (redeclare package MediumA = Medium, @@ -2523,7 +2523,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { -107.54140439948914, 106.96068021130941 }, extent = {{-10, -10}, {10, 10}} ))); - one_spaces_air_handling_unit.Common.Controls.ventilation.AhuControlAhu_control + one_spaces_air_handling_unit.Trano.Controls.ventilation.AhuControlAhu_control ahu_control annotation ( Placement(transformation(origin = { 164.04793086122075, -103.76156629996099 }, extent = {{-10, -10}, {10, 10}} @@ -2533,7 +2533,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { -200, 100 }, extent = {{-10, -10}, {10, 10}} ))); - one_spaces_air_handling_unit.Common.Controls.ventilation.DataServer + one_spaces_air_handling_unit.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { 1.2949823308551074, 181.46416253730578 }, diff --git a/tests/data/space_1_different_construction_types.mo b/tests/data/space_1_different_construction_types.mo index 687e68e..1e64b2c 100644 --- a/tests/data/space_1_different_construction_types.mo +++ b/tests/data/space_1_different_construction_types.mo @@ -1,6 +1,6 @@ package space_1_different_construction_types -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -453,7 +453,7 @@ connect(dataBus.yCooEmission, emissionControl.yCoo); connect(dataBus.yHeaEmission, emissionControl.yHea); end EmissionControlEmission_control; model OccupancyOccupancy_0 -extends space_1_different_construction_types.Common.Occupancy.SimpleOccupancy ; +extends space_1_different_construction_types.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2182,7 +2182,7 @@ end PartialVAVBox; IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; package Data "Data for transient thermal building simulation" extends Modelica.Icons.MaterialPropertiesPackage; @@ -2432,12 +2432,12 @@ package MediumW = IDEAS.Media.Water "Medium model"; Placement(transformation(origin = { 159.6958247601017, -58.70919757856324 }, extent = {{-10, -10}, {10, 10}} ))); - space_1_different_construction_types.Common.HeatTransfer.IdealHeatingSystem.IdealHeatEmission + space_1_different_construction_types.Trano.HeatTransfer.IdealHeatingSystem.IdealHeatEmission emission annotation ( Placement(transformation(origin = { 0, -75 }, extent = {{-10, -10}, {10, 10}} ))); - space_1_different_construction_types.Common.Controls.ventilation.EmissionControlEmission_control + space_1_different_construction_types.Trano.Controls.ventilation.EmissionControlEmission_control emission_control( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -2445,7 +2445,7 @@ package MediumW = IDEAS.Media.Water "Medium model"; Placement(transformation(origin = { 196.42836232113802, 24.95387851470973 }, extent = {{-10, -10}, {10, 10}} ))); - space_1_different_construction_types.Common.Controls.ventilation.OccupancyOccupancy_0 + space_1_different_construction_types.Trano.Controls.ventilation.OccupancyOccupancy_0 occupancy_0( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2461,7 +2461,7 @@ annotation (Placement(transformation(extent={{-96,76},{-76,96}}))); annotati Placement(transformation(origin = { -100, 200 }, extent = {{-10, -10}, {10, 10}} ))); - space_1_different_construction_types.Common.Controls.ventilation.DataServer + space_1_different_construction_types.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { 32.712922432148936, -176.79392812480577 }, diff --git a/tests/data/space_1_ideal_heating.mo b/tests/data/space_1_ideal_heating.mo index 51def1e..83b3e79 100644 --- a/tests/data/space_1_ideal_heating.mo +++ b/tests/data/space_1_ideal_heating.mo @@ -1,6 +1,6 @@ package space_1_ideal_heating -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -453,7 +453,7 @@ connect(dataBus.yCooEmission, emissionControl.yCoo); connect(dataBus.yHeaEmission, emissionControl.yHea); end EmissionControlEmission_control; model OccupancyOccupancy_0 -extends space_1_ideal_heating.Common.Occupancy.SimpleOccupancy ; +extends space_1_ideal_heating.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2182,7 +2182,7 @@ end PartialVAVBox; IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; model building parameter Buildings.HeatTransfer.Data.GlazingSystems.Generic double_glazing( @@ -2311,12 +2311,12 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 0, 0 }, extent = {{-20, -20}, {20, 20}} ))); - space_1_ideal_heating.Common.HeatTransfer.IdealHeatingSystem.IdealHeatEmission + space_1_ideal_heating.Trano.HeatTransfer.IdealHeatingSystem.IdealHeatEmission emission annotation ( Placement(transformation(origin = { 0, -75 }, extent = {{-10, -10}, {10, 10}} ))); - space_1_ideal_heating.Common.Controls.ventilation.EmissionControlEmission_control + space_1_ideal_heating.Trano.Controls.ventilation.EmissionControlEmission_control emission_control( schedule=3600*{7, 19}, THeaSet=24.0, THeaSetBack=16.0 @@ -2324,7 +2324,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { -125.41957781668685, 151.9752897920488 }, extent = {{-10, -10}, {10, 10}} ))); - space_1_ideal_heating.Common.Controls.ventilation.OccupancyOccupancy_0 + space_1_ideal_heating.Trano.Controls.ventilation.OccupancyOccupancy_0 occupancy_0( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2339,7 +2339,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { -100, 200 }, extent = {{-10, -10}, {10, 10}} ))); - space_1_ideal_heating.Common.Controls.ventilation.DataServer + space_1_ideal_heating.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { -63.20210430815346, -195.55953750187706 }, diff --git a/tests/data/space_with_door.mo b/tests/data/space_with_door.mo index b3877ff..b058625 100644 --- a/tests/data/space_with_door.mo +++ b/tests/data/space_with_door.mo @@ -1,6 +1,6 @@ package space_with_door -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -405,7 +405,7 @@ constructed by the signals connected to this bus. preserveAspectRatio=false))); end AHU_G36; model OccupancyOccupancy_0 -extends space_with_door.Common.Occupancy.SimpleOccupancy ; +extends space_with_door.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2129,7 +2129,7 @@ end PartialVAVBox; IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; model building parameter Buildings.HeatTransfer.Data.GlazingSystems.Generic double_glazing( @@ -2259,7 +2259,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 0, 0 }, extent = {{-20, -20}, {20, 20}} ))); - space_with_door.Common.Controls.ventilation.OccupancyOccupancy_0 + space_with_door.Trano.Controls.ventilation.OccupancyOccupancy_0 occupancy_0( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2274,7 +2274,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { -100, 200 }, extent = {{-10, -10}, {10, 10}} ))); - space_with_door.Common.Controls.ventilation.DataServer + space_with_door.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { -112.54722958657662, -156.52815202456955 }, diff --git a/tests/data/space_with_same_properties.mo b/tests/data/space_with_same_properties.mo index 82e84ec..0046ad9 100644 --- a/tests/data/space_with_same_properties.mo +++ b/tests/data/space_with_same_properties.mo @@ -1,6 +1,6 @@ package space_with_same_properties -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -405,7 +405,7 @@ constructed by the signals connected to this bus. preserveAspectRatio=false))); end AHU_G36; model OccupancyOccupancy_0 -extends space_with_same_properties.Common.Occupancy.SimpleOccupancy ; +extends space_with_same_properties.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2129,7 +2129,7 @@ end PartialVAVBox; IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; model building parameter Buildings.HeatTransfer.Data.GlazingSystems.Generic double_glazing( @@ -2252,7 +2252,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { 0, 0 }, extent = {{-20, -20}, {20, 20}} ))); - space_with_same_properties.Common.Controls.ventilation.OccupancyOccupancy_0 + space_with_same_properties.Trano.Controls.ventilation.OccupancyOccupancy_0 occupancy_0( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2267,7 +2267,7 @@ parameter Integer nRoo = 2 "Number of rooms"; Placement(transformation(origin = { -100, 200 }, extent = {{-10, -10}, {10, 10}} ))); - space_with_same_properties.Common.Controls.ventilation.DataServer + space_with_same_properties.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { 101.0469781148643, -173.05399045832283 }, diff --git a/tests/data/space_with_same_properties_ideas.mo b/tests/data/space_with_same_properties_ideas.mo index 921ac0c..f232982 100644 --- a/tests/data/space_with_same_properties_ideas.mo +++ b/tests/data/space_with_same_properties_ideas.mo @@ -1,6 +1,6 @@ package space_with_same_properties_ideas -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -405,7 +405,7 @@ constructed by the signals connected to this bus. preserveAspectRatio=false))); end AHU_G36; model OccupancyOccupancy_0 -extends space_with_same_properties_ideas.Common.Occupancy.SimpleOccupancy ; +extends space_with_same_properties_ideas.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2129,7 +2129,7 @@ end PartialVAVBox; IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; package Data "Data for transient thermal building simulation" extends Modelica.Icons.MaterialPropertiesPackage; @@ -2286,7 +2286,7 @@ package MediumW = IDEAS.Media.Water "Medium model"; Placement(transformation(origin = { 149.44386215780526, 130.07202744759726 }, extent = {{-10, -10}, {10, 10}} ))); - space_with_same_properties_ideas.Common.Controls.ventilation.OccupancyOccupancy_0 + space_with_same_properties_ideas.Trano.Controls.ventilation.OccupancyOccupancy_0 occupancy_0( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2302,7 +2302,7 @@ annotation (Placement(transformation(extent={{-96,76},{-76,96}}))); annotati Placement(transformation(origin = { -100, 200 }, extent = {{-10, -10}, {10, 10}} ))); - space_with_same_properties_ideas.Common.Controls.ventilation.DataServer + space_with_same_properties_ideas.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { -23.106438261657964, 170.99217089321024 }, diff --git a/tests/data/two_spaces_air_handling_unit.mo b/tests/data/two_spaces_air_handling_unit.mo index 5d7ba29..e0dce82 100644 --- a/tests/data/two_spaces_air_handling_unit.mo +++ b/tests/data/two_spaces_air_handling_unit.mo @@ -1,6 +1,6 @@ package two_spaces_air_handling_unit -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -405,7 +405,7 @@ constructed by the signals connected to this bus. preserveAspectRatio=false))); end AHU_G36; model OccupancyOccupancy_0 -extends two_spaces_air_handling_unit.Common.Occupancy.SimpleOccupancy ; +extends two_spaces_air_handling_unit.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -468,7 +468,7 @@ connect(dataBus.yLeaValAlaVav_in, rehBoxCon.yLeaValAla); connect(dataBus.yLowTemAlaVav_in, rehBoxCon.yLowTemAla); end VAVControlVav_in_control; model OccupancyOccupancy_1 -extends two_spaces_air_handling_unit.Common.Occupancy.SimpleOccupancy ; +extends two_spaces_air_handling_unit.Trano.Occupancy.SimpleOccupancy ; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2379,7 +2379,7 @@ graphics={ thickness=1)})); end PartialVAVBox; model VAVBoxVav_in -extends two_spaces_air_handling_unit.Common.Fluid.Ventilation.PartialVAVBox; +extends two_spaces_air_handling_unit.Trano.Fluid.Ventilation.PartialVAVBox; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2391,7 +2391,7 @@ connect(dataBus.TDisVav_in_control, senTem.T); end VAVBoxVav_in; model VAVBoxVav_in_2 -extends two_spaces_air_handling_unit.Common.Fluid.Ventilation.PartialVAVBox; +extends two_spaces_air_handling_unit.Trano.Fluid.Ventilation.PartialVAVBox; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2403,7 +2403,7 @@ connect(dataBus.TDisVav_in_control_2, senTem.T); end VAVBoxVav_in_2; model AhuAhu - extends two_spaces_air_handling_unit.Common.Fluid.Ventilation.PartialAhu; + extends two_spaces_air_handling_unit.Trano.Fluid.Ventilation.PartialAhu; Controls.BaseClasses.DataBus dataBus annotation (Placement(transformation( extent={{-120,-18},{-80,22}}), iconTransformation(extent={{-120,62},{-78,98}}))); @@ -2508,7 +2508,7 @@ connect(dataBus.dpDucAhu_control, dpDisSupFan.p_rel); IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; model building parameter Buildings.HeatTransfer.Data.GlazingSystems.Generic double_glazing( @@ -2620,7 +2620,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { 0, 0 }, extent = {{-20, -20}, {20, 20}} ))); - two_spaces_air_handling_unit.Common.Controls.ventilation.OccupancyOccupancy_0 + two_spaces_air_handling_unit.Trano.Controls.ventilation.OccupancyOccupancy_0 occupancy_0( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2628,7 +2628,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { -50, 0 }, extent = {{-10, -10}, {10, 10}} ))); - two_spaces_air_handling_unit.Common. + two_spaces_air_handling_unit.Trano. Fluid.Ventilation.VAVBoxVav_in vav_in( redeclare package MediumA = Medium, @@ -2644,7 +2644,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { -111.61476755368932, 152.6501474617446 }, extent = {{-10, -10}, {10, 10}} ))); - two_spaces_air_handling_unit.Common.Controls.ventilation.VAVControlVav_in_control + two_spaces_air_handling_unit.Trano.Controls.ventilation.VAVControlVav_in_control vav_in_control annotation ( Placement(transformation(origin = { -124.59282577775998, -131.38906232838605 }, extent = {{-10, -10}, {10, 10}} @@ -2699,7 +2699,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { 250, 150 }, extent = {{-20, -20}, {20, 20}} ))); - two_spaces_air_handling_unit.Common.Controls.ventilation.OccupancyOccupancy_1 + two_spaces_air_handling_unit.Trano.Controls.ventilation.OccupancyOccupancy_1 occupancy_1( gain=[35; 70; 30], k=1/6/4, occupancy=3600*{7, 19} @@ -2707,7 +2707,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { 200, 150 }, extent = {{-10, -10}, {10, 10}} ))); - two_spaces_air_handling_unit.Common. + two_spaces_air_handling_unit.Trano. Fluid.Ventilation.VAVBoxVav_in_2 vav_in_2( redeclare package MediumA = Medium, @@ -2723,7 +2723,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { 24.697126693482428, 185.3535408438867 }, extent = {{-10, -10}, {10, 10}} ))); - two_spaces_air_handling_unit.Common.Controls.ventilation.VAVControlVav_in_control_2 + two_spaces_air_handling_unit.Trano.Controls.ventilation.VAVControlVav_in_control_2 vav_in_control_2 annotation ( Placement(transformation(origin = { -25.96563125437091, 184.75274257902757 }, extent = {{-10, -10}, {10, 10}} @@ -2762,7 +2762,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { -100, 200 }, extent = {{-10, -10}, {10, 10}} ))); - two_spaces_air_handling_unit.Common.Fluid. + two_spaces_air_handling_unit.Trano.Fluid. Ventilation.AhuAhu ahu (redeclare package MediumA = Medium, @@ -2773,7 +2773,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { -32.4947924922398, -200.0 }, extent = {{-10, -10}, {10, 10}} ))); - two_spaces_air_handling_unit.Common.Controls.ventilation.AhuControlAhu_control + two_spaces_air_handling_unit.Trano.Controls.ventilation.AhuControlAhu_control ahu_control annotation ( Placement(transformation(origin = { -18.848264133810893, -172.48764808384604 }, extent = {{-10, -10}, {10, 10}} @@ -2783,7 +2783,7 @@ package MediumW = Buildings.Media.Water "Medium model"; Placement(transformation(origin = { -200, 100 }, extent = {{-10, -10}, {10, 10}} ))); - two_spaces_air_handling_unit.Common.Controls.ventilation.DataServer + two_spaces_air_handling_unit.Trano.Controls.ventilation.DataServer data_bus (redeclare package Medium = Medium) annotation ( Placement(transformation(origin = { 124.32975871427716, 137.56684051243647 }, diff --git a/tests/models/ahu.yaml b/tests/models/ahu.yaml index db195ff..a200f74 100644 --- a/tests/models/ahu.yaml +++ b/tests/models/ahu.yaml @@ -60,7 +60,7 @@ components: target: element.control.name category: ventilation template: "\n model Ahu{{ element.name | capitalize}}\n extends {{ package_name\ - \ }}.Common.Fluid.Ventilation.PartialAhu;\n {{bus_template}}\n equation\n\ + \ }}.Trano.Fluid.Ventilation.PartialAhu;\n {{bus_template}}\n equation\n\ \ {{bus_ports | safe}}\n end Ahu{{ element.name | capitalize}};\n \ \ " ports: @@ -88,7 +88,7 @@ components: - dataBus targets: - AhuControl - template: "{{package_name}}.Common.Fluid.\n Ventilation.Ahu{{ element.name |\ + template: "{{package_name}}.Trano.Fluid.\n Ventilation.Ahu{{ element.name |\ \ capitalize}}\n {{ element.name }}\n (redeclare package MediumA = Medium,\n\ \ {% raw %}\n VRoo={100,100},\n AFlo={20,20},\n mCooVAV_flow_nominal={0.01,0.01}{%\ \ endraw %})" diff --git a/tests/models/boiler.yaml b/tests/models/boiler.yaml index f5b091a..caf596c 100644 --- a/tests/models/boiler.yaml +++ b/tests/models/boiler.yaml @@ -1,6 +1,6 @@ ideas: - template: | - {{package_name}}.Common.Fluid.Boilers. + {{package_name}}.Trano.Fluid.Boilers. BoilerWithStorage{{ element.name | capitalize}} {{ element.name }}( {{ macros.render_parameters(parameters) | safe}}, redeclare package MediumW = MediumW) "Boiler" @@ -25,7 +25,7 @@ ideas: component_template: template: | model BoilerWithStorage{{ element.name | capitalize}} - extends {{ package_name }}.Common.Fluid.Boilers.PartialBoilerWithStorage; + extends {{ package_name }}.Trano.Fluid.Boilers.PartialBoilerWithStorage; {{bus_template}} equation {{bus_ports | safe}} diff --git a/tests/models/radiator.yaml b/tests/models/radiator.yaml index 2b299a1..44d4678 100644 --- a/tests/models/radiator.yaml +++ b/tests/models/radiator.yaml @@ -26,6 +26,6 @@ components: - y targets: - Control - template: "\n {{package_name}}.Common.HeatTransfer.IdealHeatingSystem.IdealHeatEmission\n\ + template: "\n {{package_name}}.Trano.HeatTransfer.IdealHeatingSystem.IdealHeatEmission\n\ \ {{ element.name }}" variant: ideal diff --git a/trano/elements/envelope.py b/trano/elements/envelope.py index 30820eb..96227fb 100644 --- a/trano/elements/envelope.py +++ b/trano/elements/envelope.py @@ -251,7 +251,7 @@ def from_neighbors(cls, neighbors: list["BaseElement"]) -> "WindowedWallParamete window_height = [] included_external_walls = [] for window in windows: - wall = get_common_wall_properties(neighbors, window) + wall = get_Trano_wall_properties(neighbors, window) surfaces.append(wall.surface) azimuths.append(wall.azimuth) layers.append(wall.construction.name) @@ -274,7 +274,7 @@ def from_neighbors(cls, neighbors: list["BaseElement"]) -> "WindowedWallParamete ) -def get_common_wall_properties( +def get_Trano_wall_properties( neighbors: list["BaseElement"], window: BaseWindow ) -> BaseSimpleWall: walls = [ diff --git a/trano/elements/models/ahu_control.yaml b/trano/elements/models/ahu_control.yaml index 2005536..66332a6 100644 --- a/trano/elements/models/ahu_control.yaml +++ b/trano/elements/models/ahu_control.yaml @@ -449,7 +449,7 @@ false "template": |2- - {{package_name}}.Common.Controls.ventilation.AhuControl{{ element.name | capitalize}} + {{package_name}}.Trano.Controls.ventilation.AhuControl{{ element.name | capitalize}} {{ element.name }} "variant": |- default diff --git a/trano/elements/models/air_handling_unit.yaml b/trano/elements/models/air_handling_unit.yaml index c643f73..503acff 100644 --- a/trano/elements/models/air_handling_unit.yaml +++ b/trano/elements/models/air_handling_unit.yaml @@ -109,7 +109,7 @@ "category": |- ventilation "template": "\n model Ahu{{ element.name | capitalize}}\n extends {{ package_name\ - \ }}.Common.Fluid.Ventilation.PartialAhu;\n {{bus_template}}\n equation\n\ + \ }}.Trano.Fluid.Ventilation.PartialAhu;\n {{bus_template}}\n equation\n\ \ {{bus_ports | safe}}\n end Ahu{{ element.name | capitalize}};\n \ \ " "figures": [] @@ -160,7 +160,7 @@ - |- AhuControl "template": |- - {{package_name}}.Common.Fluid. + {{package_name}}.Trano.Fluid. Ventilation.Ahu{{ element.name | capitalize}} {{ element.name }} (redeclare package MediumA = Medium, @@ -208,7 +208,7 @@ "use_counter": !!bool |- false "template": |- - {{package_name}}.Common.Fluid. + {{package_name}}.Trano.Fluid. Ventilation.SimpleHVACBuildings {{ element.name }} (redeclare package Medium = Medium) diff --git a/trano/elements/models/boiler.yaml b/trano/elements/models/boiler.yaml index 207a39e..e3525ba 100644 --- a/trano/elements/models/boiler.yaml +++ b/trano/elements/models/boiler.yaml @@ -45,7 +45,7 @@ "category": |- boiler "template": "\n model BoilerWithStorage{{ element.name | capitalize}}\n \ - \ extends {{ package_name }}.Common.Fluid.Boilers.PartialBoilerWithStorage;\n\ + \ extends {{ package_name }}.Trano.Fluid.Boilers.PartialBoilerWithStorage;\n\ \ {{bus_template}}\n equation\n {{bus_ports | safe}}\n end BoilerWithStorage{{\ \ element.name | capitalize}};\n " "figures": @@ -118,7 +118,7 @@ DataBus "use_counter": !!bool |- false - "template": "\n{{package_name}}.Common.Fluid.Boilers.\nBoilerWithStorage{{ element.name\ + "template": "\n{{package_name}}.Trano.Fluid.Boilers.\nBoilerWithStorage{{ element.name\ \ | capitalize}} {{ element.name }}(\n{{ macros.render_parameters(parameters)\ \ | safe}},\nredeclare package MediumW = MediumW, fue = Buildings.Fluid.Data.Fuels.HeatingOilLowerHeatingValue()) \"Boiler\" " "variant": |- diff --git a/trano/elements/models/boiler_control.yaml b/trano/elements/models/boiler_control.yaml index a6ffc29..c64ace3 100644 --- a/trano/elements/models/boiler_control.yaml +++ b/trano/elements/models/boiler_control.yaml @@ -54,7 +54,7 @@ "category": |- control "template": "\n model BoilerControl{{ element.name | capitalize}}\n extends\ - \ {{ package_name }}.Common.Controls.ventilation.PartialBoilerControl;\n \ + \ {{ package_name }}.Trano.Controls.ventilation.PartialBoilerControl;\n \ \ {{bus_template}}\n equation\n {{bus_ports | safe}}\n end BoilerControl{{\ \ element.name | capitalize}};\n " "figures": [] @@ -78,7 +78,7 @@ false "template": |2- - {{package_name}}.Common.Controls.ventilation.BoilerControl{{ element.name | capitalize}} + {{package_name}}.Trano.Controls.ventilation.BoilerControl{{ element.name | capitalize}} {{ element.name }}({{ macros.render_parameters(parameters) | safe}}) "variant": |- default @@ -137,7 +137,7 @@ "category": |- control "template": "\n model BoilerControl{{ element.name | capitalize}}\n extends\ - \ {{ package_name }}.Common.Controls.ventilation.PartialBoilerControl;\n \ + \ {{ package_name }}.Trano.Controls.ventilation.PartialBoilerControl;\n \ \ {{bus_template}}\n equation\n {{bus_ports | safe}}\n end BoilerControl{{\ \ element.name | capitalize}};\n " "figures": [] @@ -161,7 +161,7 @@ false "template": |2- - {{package_name}}.Common.Controls.ventilation.BoilerControl{{ element.name | capitalize}} + {{package_name}}.Trano.Controls.ventilation.BoilerControl{{ element.name | capitalize}} {{ element.name }}({{ macros.render_parameters(parameters) | safe}}) "variant": |- default diff --git a/trano/elements/models/collector_control.yaml b/trano/elements/models/collector_control.yaml index 01746e9..793b41c 100644 --- a/trano/elements/models/collector_control.yaml +++ b/trano/elements/models/collector_control.yaml @@ -112,7 +112,7 @@ false "template": |2- - {{package_name}}.Common.Controls.ventilation.CollectorControl{{ element.name | capitalize}} + {{package_name}}.Trano.Controls.ventilation.CollectorControl{{ element.name | capitalize}} {{ element.name }} "variant": |- default diff --git a/trano/elements/models/data_bus.yaml b/trano/elements/models/data_bus.yaml index 83a38a1..457a343 100644 --- a/trano/elements/models/data_bus.yaml +++ b/trano/elements/models/data_bus.yaml @@ -88,7 +88,7 @@ "use_counter": !!bool |- false "template": |2- - {{package_name}}.Common.Controls.ventilation.DataServer + {{package_name}}.Trano.Controls.ventilation.DataServer {{ element.name }} (redeclare package Medium = Medium) "variant": |- diff --git a/trano/elements/models/emission_control.yaml b/trano/elements/models/emission_control.yaml index cdef999..4137509 100644 --- a/trano/elements/models/emission_control.yaml +++ b/trano/elements/models/emission_control.yaml @@ -144,7 +144,7 @@ false "template": |2- - {{package_name}}.Common.Controls.ventilation.EmissionControl{{ element.name | capitalize}} + {{package_name}}.Trano.Controls.ventilation.EmissionControl{{ element.name | capitalize}} {{ element.name }}({{ macros.render_parameters(parameters) | safe}}) "variant": |- default diff --git a/trano/elements/models/occupancy.yaml b/trano/elements/models/occupancy.yaml index 8517b37..f08f876 100644 --- a/trano/elements/models/occupancy.yaml +++ b/trano/elements/models/occupancy.yaml @@ -17,7 +17,7 @@ "category": |- control "template": "\nmodel Occupancy{{ element.name | capitalize}}\nextends {{ package_name\ - \ }}.Common.Occupancy.SimpleOccupancy ;\n{{bus_template}}\nequation\n{{bus_ports\ + \ }}.Trano.Occupancy.SimpleOccupancy ;\n{{bus_template}}\nequation\n{{bus_ports\ \ | safe}}\n end Occupancy{{ element.name | capitalize}};\n " "figures": [] "library": |- @@ -44,7 +44,7 @@ false "template": |2- - {{package_name}}.Common.Controls.ventilation.Occupancy{{ element.name | capitalize}} + {{package_name}}.Trano.Controls.ventilation.Occupancy{{ element.name | capitalize}} {{ element.name }}({{ macros.render_parameters(parameters) | safe}}) "variant": |- default diff --git a/trano/elements/models/pump.yaml b/trano/elements/models/pump.yaml index 3d11891..0dbe71b 100644 --- a/trano/elements/models/pump.yaml +++ b/trano/elements/models/pump.yaml @@ -36,7 +36,7 @@ "category": |- ventilation "template": "\nmodel Pump{{ element.name | capitalize}}\nextends {{ package_name\ - \ }}.Common.Fluid.Ventilation.PartialPump;\n{{bus_template}}\nequation\n{{bus_ports\ + \ }}.Trano.Fluid.Ventilation.PartialPump;\n{{bus_template}}\nequation\n{{bus_ports\ \ | safe}}\n end Pump{{ element.name | capitalize}};\n " "figures": [] "library": |- @@ -76,7 +76,7 @@ "use_counter": !!bool |- false "template": |2- - {{ package_name }}.Common. + {{ package_name }}.Trano. Fluid.Ventilation.Pump{{ element.name | capitalize }} {{ element.name }}( {{ macros.render_parameters(parameters) | safe}}, diff --git a/trano/elements/models/radiator.yaml b/trano/elements/models/radiator.yaml index e4c0307..3c4dd82 100644 --- a/trano/elements/models/radiator.yaml +++ b/trano/elements/models/radiator.yaml @@ -64,7 +64,7 @@ Control "template": |2- - {{package_name}}.Common.HeatTransfer.IdealHeatingSystem.IdealHeatEmission + {{package_name}}.Trano.HeatTransfer.IdealHeatingSystem.IdealHeatEmission {{ element.name }} "variant": |- ideal diff --git a/trano/elements/models/three_way_valve_control.yaml b/trano/elements/models/three_way_valve_control.yaml index c23d093..6e9f986 100644 --- a/trano/elements/models/three_way_valve_control.yaml +++ b/trano/elements/models/three_way_valve_control.yaml @@ -81,7 +81,7 @@ TemperatureSensor "template": |2- - {{package_name}}.Common.Controls.ventilation. + {{package_name}}.Trano.Controls.ventilation. ThreeWayValveControl{{ element.name | capitalize}} {{ element.name }} "variant": |- diff --git a/trano/elements/models/vav.yaml b/trano/elements/models/vav.yaml index 5774f7f..c3e7b2a 100644 --- a/trano/elements/models/vav.yaml +++ b/trano/elements/models/vav.yaml @@ -77,7 +77,7 @@ "category": |- ventilation "template": "\nmodel VAVBox{{ element.name | capitalize}}\nextends {{ package_name\ - \ }}.Common.Fluid.Ventilation.PartialVAVBox;\n{{bus_template}}\nequation\n{{bus_ports\ + \ }}.Trano.Fluid.Ventilation.PartialVAVBox;\n{{bus_template}}\nequation\n{{bus_ports\ \ | safe}}\n end VAVBox{{ element.name | capitalize}};\n " "figures": [] "library": |- @@ -109,7 +109,7 @@ "use_counter": !!bool |- false "template": |2- - {{ package_name }}.Common. + {{ package_name }}.Trano. Fluid.Ventilation.VAVBox{{ element.name | capitalize }} {{ element.name }}( redeclare package MediumA = Medium, diff --git a/trano/elements/models/vav_control.yaml b/trano/elements/models/vav_control.yaml index 75469c9..2b871aa 100644 --- a/trano/elements/models/vav_control.yaml +++ b/trano/elements/models/vav_control.yaml @@ -379,7 +379,7 @@ false "template": |2- - {{package_name}}.Common.Controls.ventilation.VAVControl{{ element.name | capitalize}} + {{package_name}}.Trano.Controls.ventilation.VAVControl{{ element.name | capitalize}} {{ element.name }} "variant": |- default diff --git a/trano/templates/common.jinja2 b/trano/templates/Trano.jinja2 similarity index 94% rename from trano/templates/common.jinja2 rename to trano/templates/Trano.jinja2 index 9bde82c..e44baf3 100644 --- a/trano/templates/common.jinja2 +++ b/trano/templates/Trano.jinja2 @@ -1,6 +1,6 @@ -{%- macro common_library(databus, dynamic_components) -%} +{%- macro Trano_library(databus, dynamic_components) -%} {% raw %} -package Common +package Trano package Occupancy model SimpleOccupancy @@ -121,7 +121,7 @@ constructed by the signals connected to this bus. package SpaceControls model PID - extends Common.Controls.Interfaces.BaseSpaceControl; + extends Trano.Controls.Interfaces.BaseSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -163,7 +163,7 @@ constructed by the signals connected to this bus. replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true); - extends Common.Controls.Interfaces.BaseSubstanceSpaceControl; + extends Trano.Controls.Interfaces.BaseSubstanceSpaceControl; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; @@ -550,26 +550,7 @@ end ventilation; package Fluid package Boilers - model Simple - - extends Buildings.Fluid.Interfaces.PartialTwoPort; - Buildings.Fluid.Sources.Boundary_pT bou(use_T_in = true, nPorts = 2, redeclare - final package Medium = Medium) annotation ( - Placement(transformation(origin = {90, 188}, extent = {{-82, -180}, {-62, -160}}))); - Modelica.Blocks.Sources.Constant constant1(k = 273 + 70) annotation ( - Placement(transformation(origin = {-32, 20}, extent = {{-10, -10}, {10, 10}}))); - equation - connect(constant1.y, bou.T_in) annotation ( - Line(points = {{-20, 20}, {6, 20}, {6, 22}}, color = {0, 0, 127})); - connect(bou.ports[1], port_b) annotation ( - Line(points = {{28, 18}, {100, 18}, {100, 0}}, color = {0, 127, 255})); - connect(bou.ports[2], port_a) annotation ( - Line(points = {{28, 18}, {-100, 18}, {-100, 0}}, color = {0, 127, 255})); - annotation ( - Icon(graphics={ Rectangle(fillPattern = FillPattern.Solid, extent = {{-80, 80}, {80, -80}}), Rectangle(fillColor = {255, 255, 255}, - fillPattern = FillPattern.Solid, extent = {{-68, 70}, {70, -70}}), Polygon(lineColor = {0, 0, 255}, fillColor = {0, 0, 255}, - fillPattern = FillPattern.Solid, points = {{-68, 18}, {-68, 18}, {-54, 32}, {-28, 16}, {0, 30}, {26, 16}, {46, 32}, {70, 18}, {70, 18}, {70, -70}, {70, -70}, {-68, -70}, {-68, -70}, {-68, 18}}, smooth = Smooth.Bezier)})); - end Simple; + partial model PartialBoilerWithStorage replaceable package MediumW = Modelica.Media.Interfaces.PartialMedium @@ -840,81 +821,6 @@ end PartialBoilerWithStorage; end Boilers; package Ventilation - model SimpleHVAC - - replaceable package Medium = Modelica.Media.Interfaces.PartialMedium - "Medium model" annotation (choicesAllMatching=true); - IDEAS.Fluid.Movers.FlowControlled_dp - fanSup( - energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, - inputType=IDEAS.Fluid.Types.InputType.Constant, - nominalValuesDefineDefaultPressureCurve=true, - redeclare package Medium = Medium, - dp_nominal=200, - m_flow_nominal=2*100*1.2/3600) "Supply fan" - annotation (Placement(transformation(extent={{4,6},{24,26}}))); - IDEAS.Fluid.Movers.FlowControlled_dp - fanRet( - energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, - inputType=IDEAS.Fluid.Types.InputType.Constant, - nominalValuesDefineDefaultPressureCurve=true, - redeclare package Medium = Medium, - dp_nominal=200, - m_flow_nominal=2*100*1.2/3600) "Return fan" - annotation (Placement(transformation(extent={{24,-34},{4,-14}}))); - IDEAS.Fluid.HeatExchangers.ConstantEffectiveness - hex( - redeclare package Medium1 = Medium, - redeclare package Medium2 = Medium, - m1_flow_nominal=2*100*1.2/3600, - m2_flow_nominal=2*100*1.2/3600, - dp1_nominal=100, - dp2_nominal=100) "Heat exchanger with constant heat recovery effectivity" - annotation (Placement(transformation(extent={{-26,-14},{-6,6}}))); - Modelica.Fluid.Interfaces.FluidPort_b port_b( - redeclare final package Medium = Medium) - "Fluid connector b (positive design flow direction is from port_a to port_b)" - annotation (Placement(transformation(extent={{118,1},{86,31}}), - iconTransformation(extent={{110,31},{90,49}}))); - - Modelica.Fluid.Interfaces.FluidPort_a port_a( - redeclare final package Medium = Medium) - "Fluid connector a (positive design flow direction is from port_a to port_b)" - annotation (Placement(transformation(extent={{84,-40},{118,-8}}), - iconTransformation(extent={{90,-49},{110,-31}}))); - IDEAS.Fluid.Sources.OutsideAir outsideAir( - azi=0, nPorts=2, redeclare package - Medium = Medium) annotation ( - Placement(transformation(origin = {-64, 2}, extent = {{-10, -10}, {10, 10}}))); - equation - connect(hex.port_b1, fanSup.port_a) annotation ( - Line(points = {{-6, 2}, {-6, 16}, {4, 16}}, color = {0, 127, 255})); - connect(hex.port_a2, fanRet.port_b) annotation ( - Line(points = {{-6, -10}, {-6, -24}, {4, -24}}, color = {0, 127, 255})); - connect(fanSup.port_b, port_b) annotation ( - Line(points = {{24, 16}, {102, 16}}, color = {0, 127, 255})); - connect(fanRet.port_a, port_a) annotation ( - Line(points = {{24, -24}, {101, -24}}, color = {0, 127, 255})); - connect( - outsideAir.ports[1], hex.port_a1) annotation ( - Line(points={{-54,4},{-40,4},{-40,2},{-26,2}}, - color = {0, 127, 255})); - connect( - outsideAir.ports[2], hex.port_b2) annotation ( - Line(points={{-54,0},{-26,0},{-26,-10}}, color = {0, 127, 255})); - annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-60}, - {100,60}}), graphics={Rectangle( - extent={{-100,60},{100,-60}}, - lineColor={255,128,0}, - fillColor={255,128,0}, - fillPattern=FillPattern.Forward)}), Diagram(coordinateSystem( - preserveAspectRatio=false, extent={{-100,-60},{100,60}}))); - end SimpleHVAC; - - model SimpleVAV - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); - end SimpleVAV; model SimpleHVACBuildings @@ -2114,6 +2020,6 @@ end PartialVAVBox; IDEAS(version="3.0.0")), Icon(graphics={ Rectangle(lineColor = {200, 200, 200}, fillColor = {248, 248, 248}, fillPattern = FillPattern.HorizontalCylinder, extent = {{-100, -100}, {100, 100}}, radius = 25), Rectangle(lineColor = {128, 128, 128}, extent = {{-100, -100}, {100, 100}}, radius = 25)})); -end Common; +end Trano; {% endraw %} {%- endmacro %} diff --git a/trano/templates/base.jinja2 b/trano/templates/base.jinja2 index 7fb522b..ce41f52 100644 --- a/trano/templates/base.jinja2 +++ b/trano/templates/base.jinja2 @@ -1,7 +1,7 @@ {% import 'macros.jinja2' as macros %} -{% import 'common.jinja2' as common %} +{% import 'Trano.jinja2' as Trano %} package {{ network.name }} -{{ common.common_library(databus, dynamic_components) }} +{{ Trano.Trano_library(databus, dynamic_components) }} {% if data.is_package %} {{ data.data|safe }} model building