From d99f13a49f7435cf304af7d381ba7cd3b154e282 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 20 May 2015 19:07:52 +0000 Subject: [PATCH] now operating on file, only on stdout if input comes from stdin --- processing/pre/mentat_spectralBox.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/processing/pre/mentat_spectralBox.py b/processing/pre/mentat_spectralBox.py index 18da42490..073f28f00 100755 --- a/processing/pre/mentat_spectralBox.py +++ b/processing/pre/mentat_spectralBox.py @@ -21,16 +21,15 @@ def outMentat(cmd,locals): return #------------------------------------------------------------------------------------------------- -def outStdout(cmd,locals): +def outFile(cmd,locals,dest): #------------------------------------------------------------------------------------------------- if cmd[0:3] == '(!)': exec(cmd[3:]) elif cmd[0:3] == '(?)': cmd = eval(cmd[3:]) - sys.stdout.write(cmd+'\n') + dest.write(cmd+'\n') else: - print(cmd) - sys.stdout.write(cmd+'\n') + dest.write(cmd+'\n') return #------------------------------------------------------------------------------------------------- @@ -40,10 +39,10 @@ def output(cmds,locals,dest): if isinstance(cmd,list): output(cmd,locals,dest) else: - {\ - 'Mentat': outMentat,\ - 'Stdout': outStdout,\ - }[dest](str(cmd),locals) + if dest == 'Mentat': + outMentat(str(cmd),locals) + else: + outFile(str(cmd),locals,dest) return @@ -266,6 +265,7 @@ for file in files: geometry(), initial_conditions(homog,microstructures), '*identify_sets', + '*show_model', '*redraw', ] @@ -275,4 +275,7 @@ for file in files: output(cmds,outputLocals,'Mentat') py_disconnect() else: - output(cmds,outputLocals,'Stdout') + output(cmds,outputLocals,file['output']) + if file['name'] != 'STDIN': + file['output'].close() + os.rename(file['name']+'_tmp',os.path.splitext(file['name'])[0] +'.proc')