epyt-flow 0.14.2__py3-none-any.whl → 0.15.0b1__py3-none-any.whl

epyt_flow/simulation/events/system_event.py

@@ -2,7 +2,7 @@
 Module provides base classes for system events such as leakages, actuator events, etc.
 """
 from abc import abstractmethod
-import epyt
+from epanet_plus import EPyT
 
 from .event import Event
 
@@ -17,13 +17,13 @@ class SystemEvent(Event):
 
         super().__init__(**kwds)
 
-    def init(self, epanet_api: epyt.epanet) -> None:
+    def init(self, epanet_api: EPyT) -> None:
         """
         Initializes the event.
 
         Parameters
         ----------
-        epanet_api : `epyt.epanet <https://epanet-python-toolkit-epyt.readthedocs.io/en/stable/api.html#epyt.epanet.epanet>`_
+        epanet_api : `epanet_plus.EPyT <https://epanet-plus.readthedocs.io/en/stable/api.html#epanet_plus.epanet_toolkit.EPyT>`_
             API to EPANET and EPANET-MSX.
         """
         self._epanet_api = epanet_api

epyt_flow/simulation/scada/complex_control.py

@@ -4,7 +4,7 @@ Module contains a class for representing complex control rules as implemented in
 from copy import deepcopy
 from typing import Any
 import numpy as np
-from epyt.epanet import ToolkitConstants
+from epanet_plus import EpanetConstants
 
 from ...serialization import JsonSerializable, COMPLEX_CONTROL_ID, COMPLEX_CONTROL_CONDITION_ID, \
     COMPLEX_CONTROL_ACTION_ID, serializable
@@ -42,6 +42,8 @@ EN_R_ACTION_STATUS_OPEN   = 1
 EN_R_ACTION_STATUS_CLOSED = 2
 EN_R_ACTION_STATUS_ACTIVE = 3
 
+RULESTATUS = ['OPEN', 'CLOSED', 'ACTIVE']
+
 
 @serializable(COMPLEX_CONTROL_CONDITION_ID, ".epytflow_complex_control_condition")
 class RuleCondition(JsonSerializable):
@@ -99,8 +101,8 @@ class RuleCondition(JsonSerializable):
         if not isinstance(object_type_id, int):
             raise TypeError("'object_type_id' must be an instance of 'int' " +
                             f"but not of '{type(object_type_id)}'")
-        if object_type_id not in [ToolkitConstants.EN_R_NODE, ToolkitConstants.EN_R_LINK,
-                                  ToolkitConstants.EN_R_SYSTEM]:
+        if object_type_id not in [EpanetConstants.EN_R_NODE, EpanetConstants.EN_R_LINK,
+                                  EpanetConstants.EN_R_SYSTEM]:
             raise ValueError(f"Invalid value '{object_type_id}' for 'object_type_id'")
         if not isinstance(object_id, str):
             raise TypeError("'object_id' must be an instance of 'str' " +
@@ -236,9 +238,9 @@ class RuleCondition(JsonSerializable):
         desc = ""
 
         if self.__attribute_id == EN_R_DEMAND:
-            if self.__object_type_id == ToolkitConstants.EN_R_NODE:
+            if self.__object_type_id == EpanetConstants.EN_R_NODE:
                 desc += f"JUNCTION {self.__object_id} DEMAND "
-            elif self.__object_type_id == ToolkitConstants.EN_R_SYSTEM:
+            elif self.__object_type_id == EpanetConstants.EN_R_SYSTEM:
                 desc += "SYSTEM DEMAND "
         elif self.__attribute_id == EN_R_HEAD:
             desc += f"JUNCTION {self.__object_id} HEAD "
@@ -326,11 +328,11 @@ class RuleAction(JsonSerializable):
         if not isinstance(link_type_id, int):
             raise TypeError("'link_type_id' must be an istanace of 'int' " +
                             f"but not of '{type(link_type_id)}'")
-        if link_type_id not in [ToolkitConstants.EN_CVPIPE, ToolkitConstants.EN_PIPE,
-                                ToolkitConstants.EN_PUMP, ToolkitConstants.EN_PRV,
-                                ToolkitConstants.EN_PSV, ToolkitConstants.EN_PBV,
-                                ToolkitConstants.EN_FCV, ToolkitConstants.EN_TCV,
-                                ToolkitConstants.EN_GPV]:
+        if link_type_id not in [EpanetConstants.EN_CVPIPE, EpanetConstants.EN_PIPE,
+                                EpanetConstants.EN_PUMP, EpanetConstants.EN_PRV,
+                                EpanetConstants.EN_PSV, EpanetConstants.EN_PBV,
+                                EpanetConstants.EN_FCV, EpanetConstants.EN_TCV,
+                                EpanetConstants.EN_GPV]:
             raise ValueError(f"Invalid value '{link_type_id}' for 'link_type_id'")
         if not isinstance(link_id, str):
             raise TypeError("'link_id' must be an instance of 'str' " +
@@ -432,9 +434,9 @@ class RuleAction(JsonSerializable):
     def __str__(self) -> str:
         desc = ""
 
-        if self.__link_type_id in [ToolkitConstants.EN_CVPIPE, ToolkitConstants.EN_PIPE]:
+        if self.__link_type_id in [EpanetConstants.EN_CVPIPE, EpanetConstants.EN_PIPE]:
             desc += "PIPE "
-        elif self.__link_type_id == ToolkitConstants.EN_PUMP:
+        elif self.__link_type_id == EpanetConstants.EN_PUMP:
             desc += "PUMP "
         else:
             desc += "VALVE "

epyt_flow/simulation/scada/custom_control.py

@@ -4,7 +4,7 @@ Module provides a base class for custom control modules.
 from abc import abstractmethod, ABC
 import warnings
 import numpy as np
-import epyt
+from epanet_plus import EPyT, EpanetConstants
 
 from . import ScadaData
 
@@ -15,7 +15,7 @@ class CustomControlModule(ABC):
 
     Attributes
     ----------
-    epanet_api : `epyt.epanet <https://epanet-python-toolkit-epyt.readthedocs.io/en/latest/api.html#epyt.epanet.epanet>`_
+    epanet_api : `epanet_plus.EPyT <https://epanet-plus.readthedocs.io/en/stable/api.html#epanet_plus.epanet_toolkit.EPyT>`_
         API to EPANET and EPANET-MSX. Is set in :func:`init`.
     """
     def __init__(self, **kwds):
@@ -23,17 +23,17 @@ class CustomControlModule(ABC):
 
         super().__init__(**kwds)
 
-    def init(self, epanet_api: epyt.epanet) -> None:
+    def init(self, epanet_api: EPyT) -> None:
         """
         Initializes the control module.
 
         Parameters
         ----------
-        epanet_api : `epyt.epanet <https://epanet-python-toolkit-epyt.readthedocs.io/en/latest/api.html#epyt.epanet.epanet>`_
+        epanet_api : `epanet_plus.EPyT <https://epanet-plus.readthedocs.io/en/stable/api.html#epanet_plus.epanet_toolkit.EPyT>`_
             API to EPANET for implementing the control module.
         """
-        if not isinstance(epanet_api, epyt.epanet):
-            raise TypeError("'epanet_api' must be an instance of 'epyt.epanet' but not of " +
+        if not isinstance(epanet_api, EPyT):
+            raise TypeError("'epanet_api' must be an instance of 'epanet_plus.EPyT' but not of " +
                             f"'{type(epanet_api)}'")
 
         self._epanet_api = epanet_api
@@ -55,9 +55,8 @@ class CustomControlModule(ABC):
                 - EN_CLOSED  = 0
                 - EN_OPEN    = 1
         """
-        pump_idx = self._epanet_api.getLinkPumpNameID().index(pump_id)
-        pump_link_idx = self._epanet_api.getLinkPumpIndex(pump_idx + 1)
-        self._epanet_api.setLinkStatus(pump_link_idx, status)
+        pump_link_idx = self._epanet_api.get_link_idx(pump_id)
+        self._epanet_api.setlinkvalue(pump_link_idx, EpanetConstants.EN_STATUS, status)
 
     def set_pump_speed(self, pump_id: str, speed: float) -> None:
         """
@@ -70,15 +69,18 @@ class CustomControlModule(ABC):
         speed : `float`
             New pump speed.
         """
-        pump_idx = self._epanet_api.getLinkPumpNameID().index(pump_id)
-        pattern_idx = self._epanet_api.getLinkPumpPatternIndex(pump_idx + 1)
+        pump_idx = self._epanet_api.get_link_idx(pump_id)
+        pattern_idx = self._epanet_api.getlinkvalue(pump_idx, EpanetConstants.EN_LINKPATTERN)
 
         if pattern_idx == 0:
             warnings.warn(f"No pattern for pump '{pump_id}' found -- a new pattern is created")
-            pattern_idx = self._epanet_api.addPattern(f"pump_speed_{pump_id}")
-            self._epanet_api.setLinkPumpPatternIndex(pattern_idx)
 
-        self._epanet_api.setPattern(pattern_idx, np.array([speed]))
+            pattern_id = f"pump_speed_{pump_id}"
+            self._epanet_api.add_pattern(pattern_id, [speed])
+            pattern_idx = self._epanet_api.getpatternindex(pattern_id)
+            self._epanet_api.setlinkvalue(pump_idx, EpanetConstants.EN_LINKPATTERN, pattern_idx)
+
+        self._epanet_api.setpattern(pattern_idx, [speed], 1)
 
     def set_valve_status(self, valve_id: str, status: int) -> None:
         """
@@ -97,9 +99,8 @@ class CustomControlModule(ABC):
                 - EN_CLOSED  = 0
                 - EN_OPEN    = 1
         """
-        valve_idx = self._epanet_api.getLinkValveNameID().index(valve_id)
-        valve_link_idx = self._epanet_api.getLinkValveIndex()[valve_idx]
-        self._epanet_api.setLinkStatus(valve_link_idx, status)
+        valve_link_idx = self._epanet_api.get_link_idx(valve_id)
+        self._epanet_api.setlinkvalue(valve_link_idx, EpanetConstants.EN_STATUS, status)
 
     def set_node_quality_source_value(self, node_id: str, pattern_id: str,
                                       qual_value: float) -> None:
@@ -116,10 +117,10 @@ class CustomControlModule(ABC):
         qual_value : `float`
             New quality source value.
         """
-        node_idx = self._epanet_api.getNodeIndex(node_id)
-        pattern_idx = self._epanet_api.getPatternIndex(pattern_id)
-        self._epanet_api.setNodeSourceQuality(node_idx, 1)
-        self._epanet_api.setPattern(pattern_idx, np.array([qual_value]))
+        node_idx = self._epanet_api.get_node_idx(node_id)
+        pattern_idx = self._epanet_api.getpatternindex(pattern_id)
+        self._epanet_api.setnodevalue(node_idx, EpanetConstants.EN_SOURCEQUAL, 1)
+        self._epanet_api.set_pattern(pattern_idx, np.array([qual_value]))
 
     @abstractmethod
     def step(self, scada_data: ScadaData) -> None:

epyt_flow/simulation/scada/scada_data.py

@@ -8,7 +8,7 @@ import numpy as np
 from scipy.sparse import bsr_array
 import matplotlib
 import pandas as pd
-from epyt.epanet import ToolkitConstants
+from epanet_plus import EpanetConstants
 
 from ..sensor_config import SensorConfig, is_flowunit_simetric, massunit_to_str, flowunit_to_str,\
     qualityunit_to_str, areaunit_to_str,\
@@ -556,7 +556,7 @@ class ScadaData(Serializable):
             New units of hydraulic measurements -- note that the flow unit specifies all other
             hydraulic measurement units.
 
-            Must be one of the following EPANET toolkit constants:
+            Must be one of the following EPANET constants:
 
                 - EN_CFS  = 0 (cubic foot/sec)
                 - EN_GPM  = 1 (gal/min)
@@ -698,195 +698,195 @@ class ScadaData(Serializable):
                                           f"'{massunit_to_str(new_unit_id)}'")
 
         def __get_flow_convert_factor(new_unit_id: int, old_unit: int) -> float:
-            if new_unit_id == ToolkitConstants.EN_CFS:
-                if old_unit == ToolkitConstants.EN_GPM:
+            if new_unit_id == EpanetConstants.EN_CFS:
+                if old_unit == EpanetConstants.EN_GPM:
                     return .0022280093
-                elif old_unit == ToolkitConstants.EN_MGD:
+                elif old_unit == EpanetConstants.EN_MGD:
                     return 1.5472286523
-                elif old_unit == ToolkitConstants.EN_IMGD:
+                elif old_unit == EpanetConstants.EN_IMGD:
                     return 1.8581441347
-                elif old_unit == ToolkitConstants.EN_AFD:
+                elif old_unit == EpanetConstants.EN_AFD:
                     return .5041666667
-                elif old_unit == ToolkitConstants.EN_LPS:
+                elif old_unit == EpanetConstants.EN_LPS:
                     return .0353146667
-                elif old_unit == ToolkitConstants.EN_LPM:
+                elif old_unit == EpanetConstants.EN_LPM:
                     return .0005885778
-                elif old_unit == ToolkitConstants.EN_MLD:
+                elif old_unit == EpanetConstants.EN_MLD:
                     return .40873456853575
-                elif old_unit == ToolkitConstants.EN_CMH:
+                elif old_unit == EpanetConstants.EN_CMH:
                     return .0098096296
-                elif old_unit == ToolkitConstants.EN_CMD:
+                elif old_unit == EpanetConstants.EN_CMD:
                     return .0004087346
-            elif new_unit_id == ToolkitConstants.EN_GPM:
-                if old_unit == ToolkitConstants.EN_CFS:
+            elif new_unit_id == EpanetConstants.EN_GPM:
+                if old_unit == EpanetConstants.EN_CFS:
                     return 448.8325660485
-                elif old_unit == ToolkitConstants.EN_MGD:
+                elif old_unit == EpanetConstants.EN_MGD:
                     return 694.44444444
-                elif old_unit == ToolkitConstants.EN_IMGD:
+                elif old_unit == EpanetConstants.EN_IMGD:
                     return 833.99300382
-                elif old_unit == ToolkitConstants.EN_AFD:
+                elif old_unit == EpanetConstants.EN_AFD:
                     return 226.28571429
-                elif old_unit == ToolkitConstants.EN_LPS:
+                elif old_unit == EpanetConstants.EN_LPS:
                     return 15.850323141
-                elif old_unit == ToolkitConstants.EN_LPM:
+                elif old_unit == EpanetConstants.EN_LPM:
                     return .2641720524
-                elif old_unit == ToolkitConstants.EN_MLD:
+                elif old_unit == EpanetConstants.EN_MLD:
                     return 183.4528141376
-                elif old_unit == ToolkitConstants.EN_CMH:
+                elif old_unit == EpanetConstants.EN_CMH:
                     return 4.4028675393
-                elif old_unit == ToolkitConstants.EN_CMD:
+                elif old_unit == EpanetConstants.EN_CMD:
                     return .1834528141
-            elif new_unit_id == ToolkitConstants.EN_MGD:
-                if old_unit == ToolkitConstants.EN_CFS:
+            elif new_unit_id == EpanetConstants.EN_MGD:
+                if old_unit == EpanetConstants.EN_CFS:
                     return .6463168831
-                elif old_unit == ToolkitConstants.EN_GPM:
+                elif old_unit == EpanetConstants.EN_GPM:
                     return .00144
-                elif old_unit == ToolkitConstants.EN_IMGD:
+                elif old_unit == EpanetConstants.EN_IMGD:
                     return 1.2009499255
-                elif old_unit == ToolkitConstants.EN_AFD:
+                elif old_unit == EpanetConstants.EN_AFD:
                     return 0.3258514286
-                elif old_unit == ToolkitConstants.EN_LPS:
+                elif old_unit == EpanetConstants.EN_LPS:
                     return .0228244653
-                elif old_unit == ToolkitConstants.EN_LPM:
+                elif old_unit == EpanetConstants.EN_LPM:
                     return .0003804078
-                elif old_unit == ToolkitConstants.EN_MLD:
+                elif old_unit == EpanetConstants.EN_MLD:
                     return .26417205124156
-                elif old_unit == ToolkitConstants.EN_CMH:
+                elif old_unit == EpanetConstants.EN_CMH:
                     return .0063401293
-                elif old_unit == ToolkitConstants.EN_CMD:
+                elif old_unit == EpanetConstants.EN_CMD:
                     return .0002641721
-            elif new_unit_id == ToolkitConstants.EN_IMGD:
-                if old_unit == ToolkitConstants.EN_CFS:
+            elif new_unit_id == EpanetConstants.EN_IMGD:
+                if old_unit == EpanetConstants.EN_CFS:
                     return .5381713837
-                elif old_unit == ToolkitConstants.EN_MGD:
+                elif old_unit == EpanetConstants.EN_MGD:
                     return .8326741846
-                elif old_unit == ToolkitConstants.EN_GPM:
+                elif old_unit == EpanetConstants.EN_GPM:
                     return .0011990508
-                elif old_unit == ToolkitConstants.EN_AFD:
+                elif old_unit == EpanetConstants.EN_AFD:
                     return .2713280726
-                elif old_unit == ToolkitConstants.EN_LPS:
+                elif old_unit == EpanetConstants.EN_LPS:
                     return .0190053431
-                elif old_unit == ToolkitConstants.EN_LPM:
+                elif old_unit == EpanetConstants.EN_LPM:
                     return .0003167557
-                elif old_unit == ToolkitConstants.EN_MLD:
+                elif old_unit == EpanetConstants.EN_MLD:
                     return .21996924829908776
-                elif old_unit == ToolkitConstants.EN_CMH:
+                elif old_unit == EpanetConstants.EN_CMH:
                     return .005279262
-                elif old_unit == ToolkitConstants.EN_CMD:
+                elif old_unit == EpanetConstants.EN_CMD:
                     return .0002199692
-            elif new_unit_id == ToolkitConstants.EN_AFD:
-                if old_unit == ToolkitConstants.EN_CFS:
+            elif new_unit_id == EpanetConstants.EN_AFD:
+                if old_unit == EpanetConstants.EN_CFS:
                     return 1.9834710744
-                elif old_unit == ToolkitConstants.EN_MGD:
+                elif old_unit == EpanetConstants.EN_MGD:
                     return 3.0688832772
-                elif old_unit == ToolkitConstants.EN_GPM:
+                elif old_unit == EpanetConstants.EN_GPM:
                     return .0044191919
-                elif old_unit == ToolkitConstants.EN_IMGD:
+                elif old_unit == EpanetConstants.EN_IMGD:
                     return 3.6855751432
-                elif old_unit == ToolkitConstants.EN_LPS:
+                elif old_unit == EpanetConstants.EN_LPS:
                     return .0700456199
-                elif old_unit == ToolkitConstants.EN_LPM:
+                elif old_unit == EpanetConstants.EN_LPM:
                     return .001167427
-                elif old_unit == ToolkitConstants.EN_MLD:
+                elif old_unit == EpanetConstants.EN_MLD:
                     return .81070995093708
-                elif old_unit == ToolkitConstants.EN_CMH:
+                elif old_unit == EpanetConstants.EN_CMH:
                     return .0194571167
-                elif old_unit == ToolkitConstants.EN_CMD:
+                elif old_unit == EpanetConstants.EN_CMD:
                     return .0008107132
-            elif new_unit_id == ToolkitConstants.EN_LPS:
-                if old_unit == ToolkitConstants.EN_CFS:
+            elif new_unit_id == EpanetConstants.EN_LPS:
+                if old_unit == EpanetConstants.EN_CFS:
                     return 28.316846592
-                elif old_unit == ToolkitConstants.EN_MGD:
+                elif old_unit == EpanetConstants.EN_MGD:
                     return 43.812636389
-                elif old_unit == ToolkitConstants.EN_IMGD:
+                elif old_unit == EpanetConstants.EN_IMGD:
                     return 52.616782407
-                elif old_unit == ToolkitConstants.EN_GPM:
+                elif old_unit == EpanetConstants.EN_GPM:
                     return .0630901964
-                elif old_unit == ToolkitConstants.EN_AFD:
+                elif old_unit == EpanetConstants.EN_AFD:
                     return 14.276410157
-                elif old_unit == ToolkitConstants.EN_LPM:
+                elif old_unit == EpanetConstants.EN_LPM:
                     return .0166666667
-                elif old_unit == ToolkitConstants.EN_MLD:
+                elif old_unit == EpanetConstants.EN_MLD:
                     return 11.574074074074
-                elif old_unit == ToolkitConstants.EN_CMH:
+                elif old_unit == EpanetConstants.EN_CMH:
                     return .2777777778
-                elif old_unit == ToolkitConstants.EN_CMD:
+                elif old_unit == EpanetConstants.EN_CMD:
                     return .0115740741
-            elif new_unit_id == ToolkitConstants.EN_LPM:
-                if old_unit == ToolkitConstants.EN_CFS:
+            elif new_unit_id == EpanetConstants.EN_LPM:
+                if old_unit == EpanetConstants.EN_CFS:
                     return 1699.0107955
-                elif old_unit == ToolkitConstants.EN_MGD:
+                elif old_unit == EpanetConstants.EN_MGD:
                     return 2628.7581833
-                elif old_unit == ToolkitConstants.EN_IMGD:
+                elif old_unit == EpanetConstants.EN_IMGD:
                     return 3157.0069444
-                elif old_unit == ToolkitConstants.EN_AFD:
+                elif old_unit == EpanetConstants.EN_AFD:
                     return 856.58460941
-                elif old_unit == ToolkitConstants.EN_LPS:
+                elif old_unit == EpanetConstants.EN_LPS:
                     return 60
-                elif old_unit == ToolkitConstants.EN_GPM:
+                elif old_unit == EpanetConstants.EN_GPM:
                     return 3.785411784
-                elif old_unit == ToolkitConstants.EN_MLD:
+                elif old_unit == EpanetConstants.EN_MLD:
                     return 694.44444444443
-                elif old_unit == ToolkitConstants.EN_CMH:
+                elif old_unit == EpanetConstants.EN_CMH:
                     return 16.666666667
-                elif old_unit == ToolkitConstants.EN_CMD:
+                elif old_unit == EpanetConstants.EN_CMD:
                     return 0.6944444444
-            elif new_unit_id == ToolkitConstants.EN_MLD:
-                if old_unit == ToolkitConstants.EN_CFS:
+            elif new_unit_id == EpanetConstants.EN_MLD:
+                if old_unit == EpanetConstants.EN_CFS:
                     return 2.4465755456688
-                elif old_unit == ToolkitConstants.EN_MGD:
+                elif old_unit == EpanetConstants.EN_MGD:
                     return 3.7854117999999777
-                elif old_unit == ToolkitConstants.EN_IMGD:
+                elif old_unit == EpanetConstants.EN_IMGD:
                     return 4.54609
-                elif old_unit == ToolkitConstants.EN_AFD:
+                elif old_unit == EpanetConstants.EN_AFD:
                     return 1.2334867714947
-                elif old_unit == ToolkitConstants.EN_LPS:
+                elif old_unit == EpanetConstants.EN_LPS:
                     return .0864
-                elif old_unit == ToolkitConstants.EN_LPM:
+                elif old_unit == EpanetConstants.EN_LPM:
                     return .00144
-                elif old_unit == ToolkitConstants.EN_GPM:
+                elif old_unit == EpanetConstants.EN_GPM:
                     return .00545099296896
-                elif old_unit == ToolkitConstants.EN_CMH:
+                elif old_unit == EpanetConstants.EN_CMH:
                     return .024
-                elif old_unit == ToolkitConstants.EN_CMD:
+                elif old_unit == EpanetConstants.EN_CMD:
                     return .00099999999999999
-            elif new_unit_id == ToolkitConstants.EN_CMH:
-                if old_unit == ToolkitConstants.EN_CFS:
+            elif new_unit_id == EpanetConstants.EN_CMH:
+                if old_unit == EpanetConstants.EN_CFS:
                     return 101.94064773
-                elif old_unit == ToolkitConstants.EN_MGD:
+                elif old_unit == EpanetConstants.EN_MGD:
                     return 157.725491
-                elif old_unit == ToolkitConstants.EN_IMGD:
+                elif old_unit == EpanetConstants.EN_IMGD:
                     return 189.42041667
-                elif old_unit == ToolkitConstants.EN_AFD:
+                elif old_unit == EpanetConstants.EN_AFD:
                     return 51.395076564
-                elif old_unit == ToolkitConstants.EN_LPS:
+                elif old_unit == EpanetConstants.EN_LPS:
                     return 3.6
-                elif old_unit == ToolkitConstants.EN_LPM:
+                elif old_unit == EpanetConstants.EN_LPM:
                     return .06
-                elif old_unit == ToolkitConstants.EN_MLD:
+                elif old_unit == EpanetConstants.EN_MLD:
                     return 41.666666666666
-                elif old_unit == ToolkitConstants.EN_GPM:
+                elif old_unit == EpanetConstants.EN_GPM:
                     return .227124707
-                elif old_unit == ToolkitConstants.EN_CMD:
+                elif old_unit == EpanetConstants.EN_CMD:
                     return 0.0416666667
-            elif new_unit_id == ToolkitConstants.EN_CMD:
-                if old_unit == ToolkitConstants.EN_CFS:
+            elif new_unit_id == EpanetConstants.EN_CMD:
+                if old_unit == EpanetConstants.EN_CFS:
                     return 2446.5755455
-                elif old_unit == ToolkitConstants.EN_MGD:
+                elif old_unit == EpanetConstants.EN_MGD:
                     return 3785.411784
-                elif old_unit == ToolkitConstants.EN_IMGD:
+                elif old_unit == EpanetConstants.EN_IMGD:
                     return 4546.09
-                elif old_unit == ToolkitConstants.EN_AFD:
+                elif old_unit == EpanetConstants.EN_AFD:
                     return 1233.4818375
-                elif old_unit == ToolkitConstants.EN_LPS:
+                elif old_unit == EpanetConstants.EN_LPS:
                     return 86.4
-                elif old_unit == ToolkitConstants.EN_LPM:
+                elif old_unit == EpanetConstants.EN_LPM:
                     return 1.44
-                elif old_unit == ToolkitConstants.EN_MLD:
+                elif old_unit == EpanetConstants.EN_MLD:
                     return 1000.
-                elif old_unit == ToolkitConstants.EN_CMH:
+                elif old_unit == EpanetConstants.EN_CMH:
                     return 24
-                elif old_unit == ToolkitConstants.EN_GPM:
+                elif old_unit == EpanetConstants.EN_GPM:
                     return 5.450992969
 
         # Convert units
@@ -926,8 +926,11 @@ class ScadaData(Serializable):
                         convert_factor_volume = 35.3147
                         convert_factor_pressure = 1.4219702084872
 
-                    pressure_data *= convert_factor_pressure
-                    tanks_volume_data *= convert_factor_volume
+                    if pressure_data is not None:
+                        pressure_data *= convert_factor_pressure
+
+                    if tanks_volume_data is not None:
+                        tanks_volume_data *= convert_factor_volume
 
         if quality_unit is not None:
             old_quality_unit = self.__sensor_config.quality_unit()