Make innner diam = DN

Project-OMOTES · Mar 25, 2024 · c4d1fcd · c4d1fcd
1 parent 2655244
commit c4d1fcd
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/src/rtctools_heat_network/esdl/_edr_pipes.json b/src/rtctools_heat_network/esdl/_edr_pipes.json
@@ -1,6 +1,6 @@
 {
     "Steel-S1-DN-20": {
-        "inner_diameter": 0.0217,
+        "inner_diameter": 0.02,
         "u_1": 0.14264250396258266,
         "u_2": 0.0036419580112703703,
         "insulation_thicknesses": [
@@ -51,7 +51,7 @@
         "xml_string": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<esdl:Pipe xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:esdl=\"http://www.tno.nl/esdl\" id=\"2af46d1f-397b-4b11-9861-30e70f13ecb4\" name=\"Steel-S1-DN-32\" innerDiameter=\"0.0372\" outerDiameter=\"0.11\" diameter=\"DN32\">\n  <dataSource xsi:type=\"esdl:DataSource\" name=\"Logstor Product Catalogue Version 2020.03\" attribution=\"https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf\"/>\n  <costInformation id=\"4507bdd8-812d-4292-b0ca-2608f542ef72\">\n    <investmentCosts xsi:type=\"esdl:SingleValue\" name=\"Combined investment and installation costs\" id=\"c81be3eb-d148-44ed-9a3f-b6e0ac268cf0\" value=\"727.9\">\n      <profileQuantityAndUnit xsi:type=\"esdl:QuantityAndUnitType\" physicalQuantity=\"COST\" unit=\"EURO\" perUnit=\"METRE\" description=\"Costs in EUR/m\" id=\"fa866980-3b99-4b2f-9752-dc0654f76955\"/>\n    </investmentCosts>\n  </costInformation>\n  <material xsi:type=\"esdl:CompoundMatter\" compoundType=\"LAYERED\">\n    <component layerWidth=\"0.0026\">\n      <matter xsi:type=\"esdl:Material\" id=\"f8ebe3fa-1e4d-42fa-ab2d-52ec87c2ab12\" name=\"steel\" thermalConductivity=\"52.15\"/>\n    </component>\n    <component layerWidth=\"0.0308\">\n      <matter xsi:type=\"esdl:Material\" id=\"9fa543c0-8262-4283-a52e-bce3641f61d9\" name=\"PUR\" thermalConductivity=\"0.027\"/>\n    </component>\n    <component layerWidth=\"0.003\">\n      <matter xsi:type=\"esdl:Material\" id=\"160b719b-f550-4267-a502-e8afe8cb3945\" name=\"HDPE\" thermalConductivity=\"0.4\"/>\n    </component>\n  </material>\n</esdl:Pipe>\n"
     },
     "Steel-S1-DN-40": {
-        "inner_diameter": 0.0431,
+        "inner_diameter": 0.04,
         "u_1": 0.2083588991429329,
         "u_2": 0.007193386331494938,
         "insulation_thicknesses": [
@@ -102,7 +102,7 @@
         "xml_string": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<esdl:Pipe xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:esdl=\"http://www.tno.nl/esdl\" id=\"411eaef8-ca85-4f4e-80c5-d12a89734038\" name=\"Steel-S1-DN-65\" innerDiameter=\"0.0703\" outerDiameter=\"0.14\" diameter=\"DN65\">\n  <dataSource xsi:type=\"esdl:DataSource\" name=\"Logstor Product Catalogue Version 2020.03\" attribution=\"https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf\"/>\n  <costInformation id=\"e3965f42-5f59-4fa5-aa64-d81fee53aa6b\">\n    <investmentCosts xsi:type=\"esdl:SingleValue\" name=\"Combined investment and installation costs\" id=\"a567e44e-8f05-4671-b9e2-c7643dc10359\" value=\"822.4\">\n      <profileQuantityAndUnit xsi:type=\"esdl:QuantityAndUnitType\" physicalQuantity=\"COST\" unit=\"EURO\" perUnit=\"METRE\" description=\"Costs in EUR/m\" id=\"6103c985-1c99-450c-83e2-2972a1c6b557\"/>\n    </investmentCosts>\n  </costInformation>\n  <material xsi:type=\"esdl:CompoundMatter\" compoundType=\"LAYERED\">\n    <component layerWidth=\"0.0029\">\n      <matter xsi:type=\"esdl:Material\" id=\"42c2fc73-edc6-4633-afd0-5f67a90d8ac2\" name=\"steel\" thermalConductivity=\"52.15\"/>\n    </component>\n    <component layerWidth=\"0.02895\">\n      <matter xsi:type=\"esdl:Material\" id=\"931996ac-2d20-4dfb-a62f-e3197a9108b9\" name=\"PUR\" thermalConductivity=\"0.027\"/>\n    </component>\n    <component layerWidth=\"0.003\">\n      <matter xsi:type=\"esdl:Material\" id=\"0ad69796-eb80-45ad-a9d7-c1997964ce08\" name=\"HDPE\" thermalConductivity=\"0.4\"/>\n    </component>\n  </material>\n</esdl:Pipe>\n"
     },
     "Steel-S1-DN-80": {
-        "inner_diameter": 0.0825,
+        "inner_diameter": 0.08,
         "u_1": 0.2869061375581693,
         "u_2": 0.011643213891622031,
         "insulation_thicknesses": [
@@ -136,7 +136,7 @@
         "xml_string": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<esdl:Pipe xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:esdl=\"http://www.tno.nl/esdl\" id=\"92e3e2b1-d1a2-4671-a113-799d5e12530c\" name=\"Steel-S1-DN-100\" innerDiameter=\"0.1071\" outerDiameter=\"0.2\" diameter=\"DN100\">\n  <dataSource xsi:type=\"esdl:DataSource\" name=\"Logstor Product Catalogue Version 2020.03\" attribution=\"https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf\"/>\n  <costInformation id=\"38256cab-e204-48da-9528-dab55059ec2f\">\n    <investmentCosts xsi:type=\"esdl:SingleValue\" name=\"Combined investment and installation costs\" id=\"9e13d1dd-9b73-4724-ac78-5742aee68618\" value=\"936.1\">\n      <profileQuantityAndUnit xsi:type=\"esdl:QuantityAndUnitType\" physicalQuantity=\"COST\" unit=\"EURO\" perUnit=\"METRE\" description=\"Costs in EUR/m\" id=\"283e5ece-fb95-4dd9-997d-dbb0eadd2d7b\"/>\n    </investmentCosts>\n  </costInformation>\n  <material xsi:type=\"esdl:CompoundMatter\" compoundType=\"LAYERED\">\n    <component layerWidth=\"0.0036\">\n      <matter xsi:type=\"esdl:Material\" id=\"c041d04e-23f0-455a-b0f1-2a6415fabe8d\" name=\"steel\" thermalConductivity=\"52.15\"/>\n    </component>\n    <component layerWidth=\"0.03965\">\n      <matter xsi:type=\"esdl:Material\" id=\"84dc8019-fa49-4110-b4bf-9aac6d5b7777\" name=\"PUR\" thermalConductivity=\"0.027\"/>\n    </component>\n    <component layerWidth=\"0.0032\">\n      <matter xsi:type=\"esdl:Material\" id=\"2d8e6bb6-e361-40a4-873e-212a69080dc7\" name=\"HDPE\" thermalConductivity=\"0.4\"/>\n    </component>\n  </material>\n</esdl:Pipe>\n"
     },
     "Steel-S1-DN-125": {
-        "inner_diameter": 0.1325,
+        "inner_diameter": 0.125,
         "u_1": 0.3507491672336199,
         "u_2": 0.014785413358434316,
         "insulation_thicknesses": [
@@ -170,7 +170,7 @@
         "xml_string": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<esdl:Pipe xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:esdl=\"http://www.tno.nl/esdl\" id=\"9f5b887b-4171-48fe-bdad-58d9638df253\" name=\"Steel-S1-DN-150\" innerDiameter=\"0.1603\" outerDiameter=\"0.25\" diameter=\"DN150\">\n  <dataSource xsi:type=\"esdl:DataSource\" name=\"Logstor Product Catalogue Version 2020.03\" attribution=\"https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf\"/>\n  <costInformation id=\"5443badc-812d-4cf2-b6a5-b70e643365f0\">\n    <investmentCosts xsi:type=\"esdl:SingleValue\" name=\"Combined investment and installation costs\" id=\"234f7d03-69a7-429a-b44f-f57c522345f1\" value=\"1126.4\">\n      <profileQuantityAndUnit xsi:type=\"esdl:QuantityAndUnitType\" physicalQuantity=\"COST\" unit=\"EURO\" perUnit=\"METRE\" description=\"Costs in EUR/m\" id=\"a5eefd42-c8e8-4dd6-b0dc-53ed92ead8a5\"/>\n    </investmentCosts>\n  </costInformation>\n  <material xsi:type=\"esdl:CompoundMatter\" compoundType=\"LAYERED\">\n    <component layerWidth=\"0.004\">\n      <matter xsi:type=\"esdl:Material\" id=\"fa85538e-ebfa-4bce-8386-04980e793e18\" name=\"steel\" thermalConductivity=\"52.15\"/>\n    </component>\n    <component layerWidth=\"0.03725\">\n      <matter xsi:type=\"esdl:Material\" id=\"3bafa031-f40f-42fc-b409-e35fffe5f457\" name=\"PUR\" thermalConductivity=\"0.027\"/>\n    </component>\n    <component layerWidth=\"0.0036\">\n      <matter xsi:type=\"esdl:Material\" id=\"893337e3-58f1-4fb4-8c25-68d71b11fb71\" name=\"HDPE\" thermalConductivity=\"0.4\"/>\n    </component>\n  </material>\n</esdl:Pipe>\n"
     },
     "Steel-S1-DN-200": {
-        "inner_diameter": 0.2101,
+        "inner_diameter": 0.2,
         "u_1": 0.4576799199049079,
         "u_2": 0.02098848308481162,
         "insulation_thicknesses": [

diff --git a/src/rtctools_heat_network/esdl/esdl_heat_model.py b/src/rtctools_heat_network/esdl/esdl_heat_model.py
@@ -96,7 +96,7 @@ def get_density(self, asset_name, carrier):
         # temperature = 20.0
         temperature = 9.0
 
-        if NetworkSettings.NETWORK_TYPE_GAS.lower() in carrier.name:  # is this maybe a bug below as well
+        if NetworkSettings.NETWORK_TYPE_GAS.lower() in carrier.name.lower():  # is this maybe a bug below as well
             density = cP.CoolProp.PropsSI(
                 "D",
                 "T",
@@ -105,7 +105,7 @@ def get_density(self, asset_name, carrier):
                 carrier.pressure * 1.0e5,
                 NetworkSettings.NETWORK_COMPOSITION_GAS,
             )
-        elif NetworkSettings.NETWORK_TYPE_HYDROGEN in carrier.name:
+        elif NetworkSettings.NETWORK_TYPE_HYDROGEN.lower() in carrier.name.lower():
             density = cP.CoolProp.PropsSI(
                 "D",
                 "T",

diff --git a/src/rtctools_heat_network/gas_physics_mixin.py b/src/rtctools_heat_network/gas_physics_mixin.py
@@ -95,7 +95,8 @@ def __init__(self, *args, **kwargs):
         """
         self.gas_network_settings = {
             "network_type": NetworkSettings.NETWORK_TYPE_GAS,
-            "maximum_velocity": 15.0,
+            "maximum_velocity": 15.0,  # check if this was the issue for not reaching v > 15 
+            # "maximum_velocity": 20.0, 
             "minimum_velocity": 0.005,
             "head_loss_option": HeadLossOption.LINEARIZED_ONE_LINE_EQUALITY,
             "minimize_head_losses": False,

diff --git a/src/rtctools_heat_network/pycml/component_library/milp/gas/gas_pipe.py b/src/rtctools_heat_network/pycml/component_library/milp/gas/gas_pipe.py
@@ -19,6 +19,7 @@ def __init__(self, name, **modifiers):
         self.disconnectable = False
 
         self.v_max = 15.0
+        # self.v_max = 20.0
         self.density = 2.5e3  # [g/m3]  # this is vlaue is overwritten?
         self.diameter = nan
         self.area = 0.25 * pi * self.diameter**2

diff --git a/tests/test_head_loss.py b/tests/test_head_loss.py
@@ -726,7 +726,7 @@ def energy_system_options(self):
                     head_loss_option_setting = head_loss_option_setting
 
                     self.gas_network_settings["head_loss_option"] = head_loss_option_setting
-                    # self.gas_network_settings["n_linearization_lines"] = 5
+                    self.gas_network_settings["n_linearization_lines"] = 5
                     self.gas_network_settings["minimize_head_losses"] = True
                     self.gas_network_settings["minimum_velocity"] = 0.0
 
@@ -739,9 +739,9 @@ def esdl_assets(self):
                     assets = super().esdl_assets
                     for asset in assets:
                         if assets[asset].asset_type in ["Pipe"]:
-                            assets[asset].attributes["diameter"] = esdl.PipeDiameterEnum.DN20
+                            # assets[asset].attributes["diameter"] = esdl.PipeDiameterEnum.DN20
                             # assets[asset].attributes["diameter"] = esdl.PipeDiameterEnum.DN40
-                            # assets[asset].attributes["diameter"] = esdl.PipeDiameterEnum.DN80
+                            assets[asset].attributes["diameter"] = esdl.PipeDiameterEnum.DN80
                             # assets[asset].attributes["diameter"] = esdl.PipeDiameterEnum.DN125
                             # assets[asset].attributes["diameter"] = esdl.PipeDiameterEnum.DN200
 
@@ -754,20 +754,26 @@ def pre(self):
                         target = self.get_timeseries(f"{demand}.target_gas_demand")
 
                         if self.esdl_assets["4abcb49f-2dac-4e00-9c93-9dbab4510a31"].attributes["diameter"] == esdl.PipeDiameterEnum.DN20:
-                            inner_pipe_diam_m = 0.0217
+                            # inner_pipe_diam_m = 0.0217
+                            inner_pipe_diam_m = 0.02
                         elif self.esdl_assets["4abcb49f-2dac-4e00-9c93-9dbab4510a31"].attributes["diameter"] == esdl.PipeDiameterEnum.DN40:
-                            inner_pipe_diam_m = 0.0431
+                            # inner_pipe_diam_m = 0.0431
+                            inner_pipe_diam_m = 0.04
                         elif self.esdl_assets["4abcb49f-2dac-4e00-9c93-9dbab4510a31"].attributes["diameter"] == esdl.PipeDiameterEnum.DN80:
-                            inner_pipe_diam_m = 0.0825
+                            # inner_pipe_diam_m = 0.0825
+                            inner_pipe_diam_m = 0.08
                         elif self.esdl_assets["4abcb49f-2dac-4e00-9c93-9dbab4510a31"].attributes["diameter"] == esdl.PipeDiameterEnum.DN125: 
-                            inner_pipe_diam_m = 0.1325
+                            # inner_pipe_diam_m = 0.1325
+                            inner_pipe_diam_m = 0.125
                         elif self.esdl_assets["4abcb49f-2dac-4e00-9c93-9dbab4510a31"].attributes["diameter"] == esdl.PipeDiameterEnum.DN200:  
-                            inner_pipe_diam_m = 0.2101
+                            # inner_pipe_diam_m = 0.2101
+                            inner_pipe_diam_m = 0.2
+
 
                         # gas_velo_m_s = 2.5
                         # gas_velo_m_s = 5.0
-                        gas_velo_m_s = 10.0
-                        # gas_velo_m_s = 15.0
+                        # gas_velo_m_s = 10.0
+                        gas_velo_m_s = 15.0
                         # gas_velo_m_s = 20.0
 
                         target_gas_demand_g_s = (