diff --git a/wetb/prepost/Simulations.py b/wetb/prepost/Simulations.py index 273a3150fa34731f0914cf5ec3c80d6b84b3c301..a9a984b627022f6c5e1967a205af9250dac3a0ce 100755 --- a/wetb/prepost/Simulations.py +++ b/wetb/prepost/Simulations.py @@ -1260,31 +1260,31 @@ def create_chunks_htc_pbs(cases, sort_by_values=['[Windspeed]'], ppn=20, # compress all result files into an archive pbs += '\necho "move results into compressed archive"\n' - pbs += 'find %s -iname "*.dat" -iname "*.sel" -print0 ' % res_base + pbs += 'find %s -name "*.dat" -o -name "*.sel" -print0 ' % res_base fname = os.path.join(res_base, 'resfiles_chunk_%05i' % ii) pbs += '| xargs -0 tar --remove-files -rf %s.tar\n' % fname - pbs += 'xz -z2 -T 15 %s.tar\n' % fname + pbs += 'xz -z2 -T %i %s.tar\n' % (ppn, fname) # compress all logfiles into an archive pbs += '\necho "move logfiles into compressed archive"\n' - pbs += 'find %s -iname "*.log" -print0 ' % log_base + pbs += 'find %s -name "*.log" -print0 ' % log_base fname = os.path.join(log_base, 'logfiles_chunk_%05i' % ii) pbs += '| xargs -0 tar --remove-files -rf %s.tar\n' % fname - pbs += 'xz -z2 -T 15 %s.tar\n' % fname + pbs += 'xz -z2 -T %i %s.tar\n' % (ppn, fname) # compress all post-processing results (saved as csv's) into an archive pbs += '\necho "move statsdel into compressed archive"\n' - pbs += 'find %s -iname "*.csv" -print0 ' % res_base + pbs += 'find %s -name "*.csv" -print0 ' % res_base fname = os.path.join(post_dir_base, 'statsdel_chunk_%05i' % ii) pbs += '| xargs -0 tar --remove-files -rf %s.tar\n' % fname - pbs += 'xz -z2 -T 15 %s.tar\n' % fname + pbs += 'xz -z2 -T %i %s.tar\n' % (ppn, fname) # compress all post-processing results (saved as csv's) into an archive pbs += '\necho "move log analysis into compressed archive"\n' - pbs += 'find %s -iname "*.csv" -print0 ' % log_base + pbs += 'find %s -name "*.csv" -print0 ' % log_base fname = os.path.join(post_dir_base, 'loganalysis_chunk_%05i' % ii) pbs += '| xargs -0 tar --remove-files -rf %s.tar\n' % fname - pbs += 'xz -z2 -T 15 %s.tar\n' % fname + pbs += 'xz -z2 -T %i %s.tar\n' % (ppn, fname) pbs += '\n' pbs += '\necho "%s"\n' % ('-'*70)