Merge pull request #99 from UdK-VPT/issue98_Convert

rename HeaterCooler_T to PrescribedOutlet this closes #98
UdK-VPT · Nov 2, 2017 · 59b7a20 · 59b7a20
2 parents 67a91f3 + 8023a73
commit 59b7a20
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/BuildingSystems/Applications/HeatingSystems/SolarHeatingSystem.mo b/BuildingSystems/Applications/HeatingSystems/SolarHeatingSystem.mo
@@ -65,7 +65,7 @@ model SolarHeatingSystem
     diameter=0.02)
     "Pipe model"
     annotation (Placement(transformation(extent={{12,-2},{32,-22}})));
-  BuildingSystems.Fluid.HeatExchangers.HeaterCooler_T hea(
+  BuildingSystems.Fluid.HeatExchangers.Heater_T hea(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
     dp_nominal=10.0)

diff --git a/BuildingSystems/Applications/HeatingSystems/WaterHeatingSystem.mo b/BuildingSystems/Applications/HeatingSystems/WaterHeatingSystem.mo
@@ -65,7 +65,7 @@ model WaterHeatingSystem
     diameter=0.02)
     "Pipe model"
     annotation (Placement(transformation(extent={{12,-2},{32,-22}})));
-  BuildingSystems.Fluid.HeatExchangers.HeaterCooler_T hea(
+  BuildingSystems.Fluid.HeatExchangers.Heater_T hea(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
     dp_nominal=10.0)

diff --git a/BuildingSystems/Applications/SolarThermalSystems/SolarThermalSystem1.mo b/BuildingSystems/Applications/SolarThermalSystems/SolarThermalSystem1.mo
@@ -122,7 +122,7 @@ BuildingSystems.Fluid.Sources.MassFlowSource_T consumption(
     k1=-1,
     k2=+1)
     annotation (Placement(transformation(extent={{-4,-4},{4,4}},rotation=-90,origin={-50,-12})));
-  BuildingSystems.Fluid.HeatExchangers.HeaterCooler_T hea(
+  BuildingSystems.Fluid.HeatExchangers.Heater_T hea(
     redeclare package Medium = Medium,
     m_flow_nominal=1,
     dp_nominal=1)

diff --git a/BuildingSystems/Applications/SolarThermalSystems/SolarThermalSystem2.mo b/BuildingSystems/Applications/SolarThermalSystems/SolarThermalSystem2.mo
@@ -124,7 +124,7 @@ model SolarThermalSystem2
     k1=-1,
     k2=+1)
     annotation (Placement(transformation(extent={{-4,-4},{4,4}},rotation=-90,origin={-50,-12})));
-  BuildingSystems.Fluid.HeatExchangers.HeaterCooler_T hea(
+  BuildingSystems.Fluid.HeatExchangers.Heater_T hea(
     redeclare package Medium = Medium,
     m_flow_nominal=1,
     dp_nominal=1)

diff --git a/BuildingSystems/Buildings/BuildingTemplates/Building1Zone0D.mo b/BuildingSystems/Buildings/BuildingTemplates/Building1Zone0D.mo
@@ -90,8 +90,8 @@ model Building1Zone0D
     final abs_2 = 0.0,
     final epsilon_1 = 0.9,
     final epsilon_2 = 0.0,
-    final width=1.0,
-    final height=AGro,
+    final width=sqrt(AGro),
+    final height=sqrt(AGro),
     nNodes={1},
     final constructionData.thickness={1.0},
     final constructionData.material.rho={1000.0},
@@ -127,7 +127,7 @@ model Building1Zone0D
     "Heat transfer coefficient (convection + radiation) outside of the building"; // after german DIN 4701 Teil2 tabular 16"
   final parameter Modelica.SIunits.SurfaceCoefficientOfHeatTransfer alphaGro = 100.0
     "Heat transfer coefficient (conduction) to the ground";
-    
+
 equation
   connect(zone.TAir, TAir[1]) annotation (Line(
     points={{-7,7},{-7,-30},{88,-30},{88,-70},{110,-70}},

diff --git a/BuildingSystems/Technologies/DistrictHeatingNetworks/Examples/DistrictHeatingNetwork_dp.mo b/BuildingSystems/Technologies/DistrictHeatingNetworks/Examples/DistrictHeatingNetwork_dp.mo
@@ -13,7 +13,7 @@ model DistrictHeatingNetwork_dp
     Tsupply_min=328.15,
     dpValve_nominal=140000)
     annotation (Placement(transformation(extent={{-42,42},{-62,62}})));
-  BuildingSystems.Fluid.HeatExchangers.HeaterCooler_T central(
+  BuildingSystems.Fluid.HeatExchangers.Heater_T central(
     redeclare package Medium = Medium,
     m_flow_nominal=10,
     dp_nominal=0,

diff --git a/...ingSystems/Technologies/DistrictHeatingNetworks/Examples/DistrictHeatingNetwork_m_flow.mo b/...ingSystems/Technologies/DistrictHeatingNetworks/Examples/DistrictHeatingNetwork_m_flow.mo
@@ -13,7 +13,7 @@ model DistrictHeatingNetwork_m_flow
     Tsupply_max=353.15,
     Tsupply_min=328.15)
     annotation (Placement(transformation(extent={{-42,42},{-62,62}})));
-  BuildingSystems.Fluid.HeatExchangers.HeaterCooler_T central(
+  BuildingSystems.Fluid.HeatExchangers.Heater_T central(
     redeclare package Medium = Medium,
     m_flow_nominal=1,
     dp_nominal=0)