Skip to content

Commit 6c92b0d

Browse files
authored
use overrideFile as default to support large scale parameter setting (OpenModelica#173)
1 parent 2a595be commit 6c92b0d

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

OMPython/__init__.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,11 +1217,17 @@ def simulate(self,resultfile=None,simflags=None): # 11
12171217
else:
12181218
simflags=" " + simflags
12191219

1220+
overrideFile = os.path.join(self.tempdir, '{}.{}'.format(self.modelName + "_override", "txt")).replace("\\", "/")
12201221
if (self.overridevariables or self.simoptionsoverride):
12211222
tmpdict=self.overridevariables.copy()
12221223
tmpdict.update(self.simoptionsoverride)
1223-
values1 = ','.join("%s=%s" % (key, val) for (key, val) in list(tmpdict.items()))
1224-
override =" -override=" + values1
1224+
# write to override file
1225+
file = open(overrideFile, "w")
1226+
for (key, value) in tmpdict.items():
1227+
name = key + "=" + value + "\n"
1228+
file.write(name)
1229+
file.close()
1230+
override =" -overrideFile=" + overrideFile
12251231
else:
12261232
override =""
12271233

@@ -1573,10 +1579,11 @@ def __simInput(self):
15731579
a = ("%s,%s" % (str(float(sl[i])), ",".join(list(str(float(inppp[i])) for inppp in interpolated_inputs_all)))) + ',0'
15741580
l.append(a)
15751581

1576-
self.csvFile = '{}.csv'.format(self.modelName)
1582+
self.csvFile = os.path.join(self.tempdir, '{}.{}'.format(self.modelName, "csv")).replace("\\", "/")
15771583
with open(self.csvFile, "w") as f:
15781584
writer = csv.writer(f, delimiter='\n')
15791585
writer.writerow(l)
1586+
f.close()
15801587

15811588
# to convert Modelica model to FMU
15821589
def convertMo2Fmu(self, version="2.0", fmuType="me_cs", fileNamePrefix="<default>", includeResources=True): # 19

0 commit comments

Comments
 (0)