Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions OMPython/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,7 @@ def sendExpression(self, command, parsed=True):


class ModelicaSystem(object):
def __init__(self, fileName=None, modelName=None, lmodel=[], useCorba=False, commandLineOptions=None, variableFilter=None, verbose=True): # 1
def __init__(self, fileName=None, modelName=None, lmodel=[], useCorba=False, commandLineOptions=None, variableFilter=None, customBuildDirectory=None, verbose=True): # 1
"""
"constructor"
It initializes to load file and build a model, generating object, exe, xml, mat, and json files. etc. It can be called :
Expand Down Expand Up @@ -856,7 +856,7 @@ def __init__(self, fileName=None, modelName=None, lmodel=[], useCorba=False, com
self.getconn.sendExpression("setCommandLineOptions(\"--linearizationDumpLanguage=python\")")
self.getconn.sendExpression("setCommandLineOptions(\"--generateSymbolicLinearization\")")

self.setTempDirectory()
self.setTempDirectory(customBuildDirectory)

if fileName is not None:
self.loadFile(verbose)
Expand Down Expand Up @@ -910,11 +910,16 @@ def loadLibrary(self, verbose):
if verbose or not result:
print(self.requestApi('getErrorString'))

def setTempDirectory(self):
def setTempDirectory(self, customBuildDirectory):
# create a unique temp directory for each session and build the model in that directory
self.tempdir = tempfile.mkdtemp()
if not os.path.exists(self.tempdir):
return print(self.tempdir, " cannot be created")
if customBuildDirectory is not None:
if not os.path.exists(customBuildDirectory):
print(customBuildDirectory, " does not exist")
self.tempdir = customBuildDirectory
else:
self.tempdir = tempfile.mkdtemp()
if not os.path.exists(self.tempdir):
print(self.tempdir, " cannot be created")

exp="".join(["cd(","\"",self.tempdir,"\"",")"]).replace("\\","/")
self.getconn.sendExpression(exp)
Expand Down