Merge remote-tracking branch 'origin/master'

这个提交包含在:
craig-warren
2015-10-02 10:15:30 +01:00
当前提交 06a1295162

查看文件

@@ -389,7 +389,7 @@ def run_model(args, modelrun, numbermodelruns, inputfile, inputdirectory):
tsolveend = perf_counter()
print('\n\nSolving took [HH:MM:SS]:'.format(datetime.timedelta(seconds=int(tsolveend - tsolvestart))))
if sys.platform != 'win32':
print('Peak memory (approx) required: {}'.format(human_size(resource.getrusage(resource.RUSAGE_SELF).ru_maxrss, False)))
print('Peak memory (approx) used: {}'.format(human_size(resource.getrusage(resource.RUSAGE_SELF).ru_maxrss, False)))