Skip to content

Commit e928e48

Browse files
committed
support variableFilter to ModelicaSystem
1 parent a2a909f commit e928e48

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

OMPython/__init__.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ def sendExpression(self, command, parsed=True):
788788

789789

790790
class ModelicaSystem(object):
791-
def __init__(self, fileName=None, modelName=None, lmodel=[], useCorba=False, commandLineOptions=None): # 1
791+
def __init__(self, fileName=None, modelName=None, lmodel=[], useCorba=False, commandLineOptions=None, variableFilter=None): # 1
792792
"""
793793
"constructor"
794794
It initializes to load file and build a model, generating object, exe, xml, mat, and json files. etc. It can be called :
@@ -846,6 +846,8 @@ def __init__(self, fileName=None, modelName=None, lmodel=[], useCorba=False, com
846846
self.outputFlag = False
847847
self.csvFile = '' # for storing inputs condition
848848
self.resultfile="" # for storing result file
849+
self.variableFilter = variableFilter
850+
849851
if not os.path.exists(self.fileName): # if file does not eixt
850852
print("File Error:" + os.path.abspath(self.fileName) + " does not exist!!!")
851853
return
@@ -920,9 +922,17 @@ def __loadingModel(self):
920922
print(loadmodelError)
921923
self.buildModel()
922924

923-
def buildModel(self):
925+
def buildModel(self, variableFilter=None):
926+
if variableFilter is not None:
927+
self.variableFilter = variableFilter
928+
929+
if self.variableFilter is not None:
930+
varFilter = "variableFilter=" + "\"" + self.variableFilter + "\""
931+
else:
932+
varFilter = ".*"
933+
924934
# buildModelResult=self.getconn.sendExpression("buildModel("+ mName +")")
925-
buildModelResult = self.requestApi("buildModel", self.modelName)
935+
buildModelResult = self.requestApi("buildModel", self.modelName, properties=varFilter)
926936
buildModelError = self.requestApi("getErrorString")
927937
# Issue #145. Always print the getErrorString since it might contains build warnings.
928938
if buildModelError:

0 commit comments

Comments
 (0)