[ModelicaSystemCmd] do *NOT* raise error if returncode != 0

could be a simulation which stoped before the final time ...

Author: syntron

OMPython/ModelicaSystem.py

@@ -251,19 +251,18 @@ def run(self) -> int:
                                     timeout=self._timeout)
             stdout = cmdres.stdout.strip()
             stderr = cmdres.stderr.strip()
+            returncode = cmdres.returncode
 
             logger.debug("OM output for command %s:\n%s", cmdl, stdout)
 
-            if cmdres.returncode != 0:
-                raise ModelicaSystemError(f"Error running command {cmdl}: nonzero return code")
             if stderr:
                 raise ModelicaSystemError(f"Error running command {cmdl}: {stderr}")
         except subprocess.TimeoutExpired:
             raise ModelicaSystemError(f"Timeout running command {repr(cmdl)}")
         except Exception as ex:
             raise ModelicaSystemError(f"Error running command {cmdl}") from ex
 
-        return True
+        return returncode
 
     @staticmethod
     def parse_simflags(simflags: str) -> dict:
@@ -396,7 +395,7 @@ def __init__(
         self.simulationFlag = False  # if the model is simulated?
         self.outputFlag = False
         self.csvFile = ''  # for storing inputs condition
-        self.resultfile = ""  # for storing result file
+        self.resultfile = None  # for storing result file
         self.variableFilter = variableFilter
 
         if self.fileName is not None and not self.fileName.is_file():  # if file does not exist
@@ -820,13 +819,13 @@ def simulate(self, resultfile: Optional[str] = None, simflags: Optional[str] = N
 
         if resultfile is None:
             # default result file generated by OM
-            self.resultfile = (self.tempdir / f"{self.modelName}_res.mat").as_posix()
+            self.resultfile = self.tempdir / f"{self.modelName}_res.mat"
         elif os.path.exists(resultfile):
-            self.resultfile = resultfile
+            self.resultfile = Path(resultfile)
         else:
-            self.resultfile = (self.tempdir / resultfile).as_posix()
+            self.resultfile = self.tempdir / resultfile
         # always define the resultfile to use
-        om_cmd.arg_set(key="r", val=self.resultfile)
+        om_cmd.arg_set(key="r", val=self.resultfile.as_posix())
 
         # allow runtime simulation flags from user input
         if simflags is not None:
@@ -862,7 +861,16 @@ def simulate(self, resultfile: Optional[str] = None, simflags: Optional[str] = N
 
             om_cmd.arg_set(key="csvInput", val=self.csvFile.as_posix())
 
-        self.simulationFlag = om_cmd.run()
+        # delete resultfile ...
+        if self.resultfile.is_file():
+            self.resultfile.unlink()
+        # ... run simulation ...
+        returncode = om_cmd.run()
+        # and check returncode *AND* resultfile
+        if returncode != 0 and self.resultfile.is_file():
+            logger.warning(f"Return code = {returncode} but result file exists!")
+
+        self.simulationFlag = True
 
     # to extract simulation results
     def getSolutions(self, varList=None, resultfile=None):  # 12
@@ -878,7 +886,7 @@ def getSolutions(self, varList=None, resultfile=None):  # 12
         >>> getSolutions(["Name1","Name2"],resultfile=""c:/a.mat"")
         """
         if resultfile is None:
-            resFile = self.resultfile
+            resFile = self.resultfile.as_posix()
         else:
             resFile = resultfile