Commit 29dddf93 authored by snuverink_j's avatar snuverink_j
Browse files

make quiet more quiet

parent be36eaad
...@@ -149,10 +149,12 @@ def main(argv): ...@@ -149,10 +149,12 @@ def main(argv):
# determine what kind of job should be ran, simulation by default # determine what kind of job should be ran, simulation by default
if doOptimize and os.environ.get('OPTIMIZER'): if doOptimize and os.environ.get('OPTIMIZER'):
print('job type: OPTIMIZATION') if quiet == False:
print('job type: OPTIMIZATION')
inputfilePath = os.environ.get('OPTIMIZER') inputfilePath = os.environ.get('OPTIMIZER')
if not (inputfilePath and glob.glob(os.path.join(inputfilePath,'*.tmpl'))): if not (inputfilePath and glob.glob(os.path.join(inputfilePath,'*.tmpl'))):
print('job type: SIMULATION') if quiet == False:
print('job type: SIMULATION')
doOptimize = False doOptimize = False
if os.environ.get('TEMPLATES'): if os.environ.get('TEMPLATES'):
inputfilePath = os.environ.get('TEMPLATES') inputfilePath = os.environ.get('TEMPLATES')
...@@ -168,7 +170,8 @@ def main(argv): ...@@ -168,7 +170,8 @@ def main(argv):
elif not os.path.isfile(os.path.join(inputfilePath,baseFileName+'.tmpl')): elif not os.path.isfile(os.path.join(inputfilePath,baseFileName+'.tmpl')):
print(baseFileName+'.tmpl cannot be found! Check if it exists in '+inputfilePath) print(baseFileName+'.tmpl cannot be found! Check if it exists in '+inputfilePath)
sys.exit() sys.exit()
print('baseFileName = '+baseFileName) if quiet == False:
print('baseFileName = '+baseFileName)
dataFile = baseFileName + '.data' dataFile = baseFileName + '.data'
tmplFile = os.path.join(inputfilePath,baseFileName+'.tmpl') tmplFile = os.path.join(inputfilePath,baseFileName+'.tmpl')
...@@ -187,7 +190,8 @@ def main(argv): ...@@ -187,7 +190,8 @@ def main(argv):
sim = Simulation(opaldict) sim = Simulation(opaldict)
qid = sim.run(N, baseFileName, inputfilePath, tmplFile, oinpFile, doTest, doKeep, doNobatch, doOptimize, info, queue, hypert, quiet) qid = sim.run(N, baseFileName, inputfilePath, tmplFile, oinpFile, doTest, doKeep, doNobatch, doOptimize, info, queue, hypert, quiet)
if doNobatch: if doNobatch:
print( "... finished!\n") if quiet == False:
print( "... finished!\n")
#else: #else:
# print( "SGE-ID= {}\n".format(qid)) # print( "SGE-ID= {}\n".format(qid))
else: else:
......
...@@ -245,7 +245,8 @@ class Simulation: ...@@ -245,7 +245,8 @@ class Simulation:
if quiet == False: if quiet == False:
print( 'Done with setup of the OPAL simulation and executing the job on {} cores...\n\n\n'.format(CORES)) print( 'Done with setup of the OPAL simulation and executing the job on {} cores...\n\n\n'.format(CORES))
ofn, fileExtension = os.path.splitext(oinpFile) ofn, fileExtension = os.path.splitext(oinpFile)
print( 'STD output is written to {}.out'.format(ofn)) if quiet == False:
print( 'STD output is written to {}.out'.format(ofn))
#execommand = 'mpirun -np ' + str(CORES) + ' ' + opalexe + ' ' + oinpFile + ' 2>&1 | tee ' + ofn + '.out' #execommand = 'mpirun -np ' + str(CORES) + ' ' + opalexe + ' ' + oinpFile + ' 2>&1 | tee ' + ofn + '.out'
outfileName = ofn +'.out' outfileName = ofn +'.out'
# Currently not writing to screen anymore # Currently not writing to screen anymore
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment