some fixes, return warnflag and errcode in getComputedTime*

epyt/epanet.py

@@ -511,7 +511,8 @@ class epanet:
 
     def __init__(self, *argv, version=2.2, ph=False, loadfile=False, msx=False, customlib=None):
         # Constants
-        # Demand model types. DDA #0 Demand driven analysis,
+        warnings.simplefilter('always')
+                # Demand model types. DDA #0 Demand driven analysis,
         # PDA #1 Pressure driven analysis.
         self.msxname = None
         self.DEMANDMODEL = ['DDA', 'PDA']
@@ -2362,6 +2363,12 @@ def getComputedTimeSeries(self):
             value_final = self.getComputedTimeSeries_ENepanet()
             return value_final
         value = self.__readEpanetBin(fid, binfile, 0)
+        value.WarnFlag = False
+        if self.errcode:
+            value.WarnFlag = True
+            value.ErrCode = self.errcode
+            self.api.ENgeterror(self.errcode)
+
         value.StatusStr = {}
         for i in range(1, len(value.Status) + 1):
             value.StatusStr[i] = []
@@ -2393,6 +2400,10 @@ def getComputedTimeSeries_ENepanet(self):
         self.api.ENepanet(self.TempInpFile, rptfile, binfile)
         fid = open(binfile, "rb")
         value = self.__readEpanetBin(fid, binfile, 0)
+        value.WarnFlag = False
+        if self.errcode:
+            value.ErrCode = self.errcode
+            value.WarnFlag = True
         value.StatusStr = {}
         for i in range(1, len(value.Status) + 1):
             value.StatusStr[i] = []
@@ -10923,7 +10934,7 @@ def __readEpanetBin(self, f, binfile, *argv):
             value.IDLabelEachLink = []
             for i in range(value.NumberLinks):
                 value.IDLabelEachLink.append(f.read(32).replace(b'\x00', b'').decode())
-            while (True):
+            while True:
                 binval = list(f.read(1))[0]
                 if binval != 0:
                     break
@@ -11001,8 +11012,13 @@ def __readEpanetBin(self, f, binfile, *argv):
             value.AverageTankReactionRate = struct.unpack('f', f.read(4))
             value.AverageSourceInflowRate = struct.unpack('f', f.read(4))
             value.NumberReportingPeriods2 = list(f.read(1))[0]
+            f.read(1)
+            f.read(1)
+            f.read(1)
             value.WarningFlag = list(f.read(1))[0]
-            value.MagicNumber = f.read(10)
+            self.errcode = value.WarningFlag
+            # check here - error
+            value.MagicNumber = struct.unpack('b', f.read(1))
 
         if len(argv) > 0:
             v = EpytValues()
@@ -13728,13 +13744,15 @@ def ENgetelseaction(self, ruleIndex, actionIndex):
         self.ENgeterror()
         return [linkIndex.value, status.value, setting.value]
 
-    def ENgeterror(self):
+    def ENgeterror(self, errcode=0):
         """ Returns the text of an error message generated by an error code, as warning.
 
         ENgeterror()
 
         """
-        if self.errcode:
+        if self.errcode or errcode:
+            if errcode:
+                self.errcode = errcode
             errmssg = create_string_buffer(150)
             self._lib.ENgeterror(self.errcode, byref(errmssg), 150)
             warnings.warn(errmssg.value.decode())