Skip to content

Commit c7e50be

Browse files
committed
[ModelicaSystem] remove _check_error()
1 parent 3550a92 commit c7e50be

1 file changed

Lines changed: 8 additions & 23 deletions

File tree

OMPython/ModelicaSystem.py

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -230,15 +230,11 @@ def setCommandLineOptions(self, commandLineOptions: str):
230230
if commandLineOptions is None:
231231
return
232232
exp = f'setCommandLineOptions("{commandLineOptions}")'
233-
if not self.sendExpression(exp):
234-
self._check_error()
233+
self.sendExpression(exp)
235234

236235
def loadFile(self, fileName: pathlib.Path):
237236
# load file
238-
loadMsg = self.sendExpression(f'loadFile("{fileName.as_posix()}")')
239-
# Show notification or warnings to the user when verbose=True OR if some error occurred i.e., not result
240-
if self._verbose or not loadMsg:
241-
self._check_error()
237+
self.sendExpression(f'loadFile("{fileName.as_posix()}")')
242238

243239
# for loading file/package, loading model and building model
244240
def loadLibrary(self, lmodel: list):
@@ -250,22 +246,19 @@ def loadLibrary(self, lmodel: list):
250246
apiCall = "loadFile"
251247
else:
252248
apiCall = "loadModel"
253-
result = self.requestApi(apiCall, element)
249+
self.requestApi(apiCall, element)
254250
elif isinstance(element, tuple):
255251
if not element[1]:
256-
libname = f"loadModel({element[0]})"
252+
expr_load_lib = f"loadModel({element[0]})"
257253
else:
258-
libname = f'loadModel({element[0]}, {{"{element[1]}"}})'
259-
result = self.sendExpression(libname)
254+
expr_load_lib = f'loadModel({element[0]}, {{"{element[1]}"}})'
255+
self.sendExpression(expr_load_lib)
260256
else:
261257
raise ModelicaSystemError("loadLibrary() failed, Unknown type detected: "
262258
f"{element} is of type {type(element)}, "
263259
"The following patterns are supported:\n"
264260
'1)["Modelica"]\n'
265261
'2)[("Modelica","3.2.3"), "PowerSystems"]\n')
266-
# Show notification or warnings to the user when verbose=True OR if some error occurred i.e., not result
267-
if self._verbose or not result:
268-
self._check_error()
269262

270263
def setTempDirectory(self, customBuildDirectory):
271264
# create a unique temp directory for each session and build the model in that directory
@@ -323,12 +316,6 @@ def _run_cmd(self, cmd: list, timeout: Optional[int] = None):
323316
except Exception as e:
324317
raise ModelicaSystemError(f"Exception {type(e)} running command {cmd}: {e}")
325318

326-
def _check_error(self):
327-
errstr = self.sendExpression("getErrorString()")
328-
if not errstr:
329-
return
330-
self._raise_error(errstr=errstr)
331-
332319
def _raise_error(self, errstr: str):
333320
if self._raiseerrors:
334321
raise ModelicaSystemError(f"OM error: {errstr}")
@@ -347,7 +334,6 @@ def buildModel(self, variableFilter=None):
347334
buildModelResult = self.requestApi("buildModel", self.modelName, properties=varFilter)
348335
if self._verbose:
349336
logger.info("OM model build result: %s", buildModelResult)
350-
self._check_error()
351337

352338
self.xmlFile = pathlib.Path(buildModelResult[0]).parent / buildModelResult[1]
353339
self.xmlparse()
@@ -1017,7 +1003,7 @@ def convertMo2Fmu(self, version="2.0", fmuType="me_cs", fileNamePrefix="<default
10171003

10181004
# report proper error message
10191005
if not os.path.exists(fmu):
1020-
self._check_error()
1006+
raise ModelicaSystemError(f"Missing FMU file: {fmu}")
10211007

10221008
return fmu
10231009

@@ -1034,7 +1020,7 @@ def convertFmu2Mo(self, fmuName): # 20
10341020

10351021
# report proper error message
10361022
if not os.path.exists(fileName):
1037-
self._check_error()
1023+
raise ModelicaSystemError(f"Missing file {fileName}")
10381024

10391025
return fileName
10401026

@@ -1050,7 +1036,6 @@ def optimize(self): # 21
10501036
properties = ','.join(f"{key}={val}" for key, val in self.optimizeOptions.items())
10511037
self.setCommandLineOptions("-g=Optimica")
10521038
optimizeResult = self.requestApi('optimize', cName, properties)
1053-
self._check_error()
10541039

10551040
return optimizeResult
10561041

0 commit comments

Comments
 (0)