linting & formatting

geojson_modelica_translator/model_connectors/couplings/5G_templates/NetworkDistributionPump_NetworkDistributionPump/ComponentDefinitions.mopt

@@ -1,3 +1,3 @@
   parameter Boolean allowFlowReversalSer = true
     "Set to true to allow flow reversal in the service lines"
-    annotation(Dialog(tab="Assumptions"), Evaluate=true);
+    annotation(Dialog(tab="Assumptions"), Evaluate=true);

geojson_modelica_translator/model_connectors/couplings/5G_templates/TimeSeries_DesignDataSeries/ComponentDefinitions.mopt

@@ -1 +1 @@
-// No components for time series and design data coupling
+// No components for time series and design data coupling

geojson_modelica_translator/model_connectors/networks/design_data_series.py

@@ -8,8 +8,7 @@
 from modelica_builder.package_parser import PackageParser
 
 from geojson_modelica_translator.model_connectors.networks.network_base import NetworkBase
-from geojson_modelica_translator.utils import ModelicaPath
-from geojson_modelica_translator.utils import load_loop_order
+from geojson_modelica_translator.utils import ModelicaPath, load_loop_order
 
 logger = logging.getLogger(__name__)
 
@@ -22,7 +21,6 @@ def __init__(self, system_parameters):
         self.id = "datDes"
         self.design_data_name = "DesignDataSeries"
 
-
     def to_modelica(self, scaffold):
         """
         Create timeSeries models based on the data in the buildings and geojsons

geojson_modelica_translator/model_connectors/networks/templates/DesignDataSeries.mot

@@ -1,13 +1,14 @@
 within {{ project_name }}.Networks.{{ model_name }};
-record DesignDataSeries "Record with design data for series network"
+record DesignDataSeries
+  "Record with design data for series network"
   extends Modelica.Icons.Record;
-  parameter Integer nBui = 3
+  parameter Integer nBui=3
     "Number of served buildings"
-    annotation(Evaluate=true);
+    annotation (Evaluate=true);
   parameter Modelica.Units.SI.MassFlowRate mPumDis_flow_nominal=95
     "Nominal mass flow rate of main distribution pump";
-  parameter Modelica.Units.SI.MassFlowRate mPipDis_flow_nominal=
-      mPumDis_flow_nominal "Nominal mass flow rate for main pipe sizing";
+  parameter Modelica.Units.SI.MassFlowRate mPipDis_flow_nominal=mPumDis_flow_nominal
+    "Nominal mass flow rate for main pipe sizing";
   parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal[nBui]
     "Nominal mass flow rate in each connection line";
   parameter Modelica.Units.SI.MassFlowRate mPla_flow_nominal=11.45
@@ -16,24 +17,31 @@ record DesignDataSeries "Record with design data for series network"
     "Storage nominal mass flow rate";
   parameter Modelica.Units.SI.PressureDifference dpPla_nominal=50000
     "Plant HX pressure drop at nomninal flow rate (primary = secondary)";
-  parameter Real epsPla = 0.935
+  parameter Real epsPla=0.935
     "Plant HX effectiveness (constant)";
-  parameter Modelica.Units.SI.Temperature TLooMin=273.15 + 6
+  parameter Modelica.Units.SI.Temperature TLooMin=273.15+6
     "Minimum loop temperature";
-  parameter Modelica.Units.SI.Temperature TLooMax=273.15 + 17
+  parameter Modelica.Units.SI.Temperature TLooMax=273.15+17
     "Maximum loop temperature";
-  parameter Real dp_length_nominal(final unit="Pa/m") = 250
+  parameter Real dp_length_nominal(
+    final unit="Pa/m")=250
     "Pressure drop per pipe length at nominal flow rate";
-  parameter Modelica.Units.SI.Length lDis[nBui+{{ design_data["number_of_loops"]-1 }}]=fill(100, nBui)
+  parameter Modelica.Units.SI.Length lDis[nBui+{{ design_data["number_of_loops"]-1 }}]=fill(
+    100,
+    nBui)
     "Length of the distribution pipe before each connection";
-  parameter Modelica.Units.SI.Length lCon[nBui]=fill(10, nBui)
+  parameter Modelica.Units.SI.Length lCon[nBui]=fill(
+    10,
+    nBui)
     "Length of each connection pipe (supply only, not counting return line)";
-  parameter Modelica.Units.SI.Length lEnd=sum(lDis)
+  parameter Modelica.Units.SI.Length lEnd=sum(
+    lDis)
     "Length of the end of the distribution line (after last connection)";
   annotation (
     defaultComponentName="datDes",
     defaultComponentPrefixes="inner",
-    Documentation(info="<html>
+    Documentation(
+      info="<html>
 <p>
 This record contains parameter declarations used in example models of DHC systems.
 </p>

geojson_modelica_translator/model_connectors/networks/templates/DesignDataSeries_Instance.mopt

@@ -18,4 +18,4 @@
     lEnd={{ globals["lEnd"] }})
     "Design data"
     {% raw %}annotation (Placement(transformation(extent={{-140,100},{-120,120}})));
-  {% endraw %}
+  {% endraw %}

tests/model_connectors/test_district_multi_ghe.py

@@ -11,10 +11,10 @@
 from geojson_modelica_translator.model_connectors.couplings.graph import CouplingGraph
 from geojson_modelica_translator.model_connectors.districts.district import District
 from geojson_modelica_translator.model_connectors.load_connectors.time_series import TimeSeries
+from geojson_modelica_translator.model_connectors.networks.design_data_series import DesignDataSeries
 from geojson_modelica_translator.model_connectors.networks.ground_coupling import GroundCoupling
 from geojson_modelica_translator.model_connectors.networks.network_distribution_pump import NetworkDistributionPump
 from geojson_modelica_translator.model_connectors.networks.unidirectional_series import UnidirectionalSeries
-from geojson_modelica_translator.model_connectors.networks.design_data_series import DesignDataSeries
 from geojson_modelica_translator.model_connectors.plants.borefield import Borefield
 from geojson_modelica_translator.system_parameters.system_parameters import SystemParameters
 from tests.base_test_case import TestCaseBase
@@ -50,7 +50,7 @@ def setUp(self):
 
         # create district data
         design_data = DesignDataSeries(sys_params)
-        
+
         # read the loop order and create building groups
         filename = (
             Path(self.data_dir)
@@ -88,7 +88,6 @@ def setUp(self):
             # empty couple between borefield and ground
             all_couplings.append(Coupling(ground_coupling, borefield, district_type="fifth_generation"))
         all_couplings.append(Coupling(ambient_water_stub, ambient_water_stub, district_type="fifth_generation"))
-
 
         graph = CouplingGraph(all_couplings)