@@ -2387,14 +2387,25 @@ def getComputedTimeSeries(self):
2387
2387
value_final.Status = value_final.Status.astype(int)
2388
2388
return value_final
2389
2389
2390
- def getComputedTimeSeries_ENepanet(self):
2390
+ def getComputedTimeSeries_ENepanet(self, tempfile=None, binfile=None, rptfile=None ):
2391
2391
""" Run analysis using ENepanet function """
2392
- self.saveInputFile(self.TempInpFile)
2393
- uuID = ''.join(random.choices(string.ascii_letters +
2394
- string.digits, k=10))
2395
- rptfile = self.TempInpFile[0:-4] + '.txt'
2396
- binfile = '@#' + uuID + '.bin'
2397
- self.api.ENepanet(self.TempInpFile, rptfile, binfile)
2392
+
2393
+ if tempfile is not None:
2394
+ self.saveInputFile(tempfile)
2395
+ else:
2396
+ self.saveInputFile(self.TempInpFile)
2397
+ uuID = ''.join(random.choices(string.ascii_letters + string.digits, k=10))
2398
+
2399
+ if binfile is None:
2400
+ binfile = '@#' + uuID + '.bin'
2401
+ if rptfile is None:
2402
+ rptfile = self.TempInpFile[:-4] + '.txt'
2403
+ self.api.ENclose()
2404
+ if tempfile is not None:
2405
+ self.api.ENepanet(tempfile, rptfile, binfile)
2406
+ else:
2407
+ self.api.ENepanet(self.TempInpFile, rptfile, binfile)
2408
+
2398
2409
fid = open(binfile, "rb")
2399
2410
value = self.__readEpanetBin(fid, binfile, 0)
2400
2411
value.WarnFlag = False
0 commit comments