From f2729255f8895c5974105ee87fe081b514240c74 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 16 Feb 2012 15:15:43 +0000 Subject: [PATCH] changed name in install script, small corrections on regex --- processing/post/spectral_parseLog.py | 28 +++++++++++++++------------- processing/setup/setup_processing.py | 2 +- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/processing/post/spectral_parseLog.py b/processing/post/spectral_parseLog.py index d00898de5..871b20058 100755 --- a/processing/post/spectral_parseLog.py +++ b/processing/post/spectral_parseLog.py @@ -31,22 +31,24 @@ parsing = [ \ ['__CLOCK__', r'^Loadcase \d+ Increment \d+/\d+ @ Iteration \d+/\d+'], ['increment', r'^Loadcase \d+ Increment (\d+)/\d+ @ Iteration \d+/\d+'], ['iteration', r'^Loadcase \d+ Increment \d+/\d+ @ Iteration (\d+)/\d+'], - ['error_divergence', r'^error divergence = [ +-eE0123456789.]+\(([ +-eE0123456789.]+)'], + ['error_divergence', r'^error divergence = [ +-eE0123456789.]+ \( ([+-eE0123456789.]+)'], + ['error_stress', r'^error stress = [ +-eE0123456789.]+ \( ([+-eE0123456789.]+)'], + ['crit_divergence', r'^error divergence = ([ +-eE0123456789.]+) \( [+-eE0123456789.]+'], + ['crit_stress', r'^error stress = ([ +-eE0123456789.]+) \( [+-eE0123456789.]+'], ['max(sym(deltaF))', r'^max symmetrix correction of deformation: ([ +-eE0123456789.]+)'], ['max(skew(deltaF))', r'^max skew correction of deformation: ([ +-eE0123456789.]+)'], ['max(sym/skew(avg(deltaF)))', r'^max sym/skew of avg correction: ([ +-eE0123456789.]+)'], - ['error_stress', r'^error stress = [ +-eE0123456789.]+\(([ +-eE0123456789.]+)'], - ['det(Fbar)', r'^determinant of new deformation: ([ +-eE0123456789.]+)'], - ['max(det(F))', r'^max determinant of deformation:([ +-eE0123456789.]+)'], - ['min(det(F))', r'^min determinant of deformation:([ +-eE0123456789.]+)'], - ['div_FT_max', r'^error divergence FT max = ([ +-eE0123456789.]+)'], - ['div_Real_RMS', r'^error divergence Real RMS = ([ +-eE0123456789.]+)'], - ['div_Real_max', r'^error divergence Real max = ([ +-eE0123456789.]+)'], - ['real(error_FT)', r'^max FT relative error ([ +-eE0123456789.]+) [ +-eE0123456789.]+'], - ['img(error_FT)', r'^max FT relative error [ +-eE0123456789.]+ ([ +-eE0123456789.]+)'], - ['real(error_iFT)', r'^max iFT relative error ([ +-eE0123456789.]+)'], - ['error_postProc', r'^max deviat. from postProc =([ +-eE0123456789.]+)'], - ['loadcase', r'^Loadcase (\d+) Increment \d+/\d+ @ Iteration \d+/\d+'] + ['det(Fbar)', r'^determinant of new deformation: ([ +-eE0123456789.]+)'], + ['max(det(F))', r'^max determinant of deformation:([ +-eE0123456789.]+)'], + ['min(det(F))', r'^min determinant of deformation:([ +-eE0123456789.]+)'], + ['div_FT_max', r'^error divergence FT max = ([ +-eE0123456789.]+)'], + ['div_Real_RMS', r'^error divergence Real RMS = ([ +-eE0123456789.]+)'], + ['div_Real_max', r'^error divergence Real max = ([ +-eE0123456789.]+)'], + ['real(error_FT)', r'^max FT relative error ([ +-eE0123456789.]+) [ +-eE0123456789.]+'], + ['img(error_FT)', r'^max FT relative error [ +-eE0123456789.]+ ([ +-eE0123456789.]+)'], + ['real(error_iFT)', r'^max iFT relative error ([ +-eE0123456789.]+)'], + ['error_postProc', r'^max deviat. from postProc =([ +-eE0123456789.]+)'], + ['loadcase', r'^Loadcase (\d+) Increment \d+/\d+ @ Iteration \d+/\d+'] ] parser = OptionParser(option_class=extendedOption, usage='%prog [options] spectralOut[s]', description = """ diff --git a/processing/setup/setup_processing.py b/processing/setup/setup_processing.py index bc1dd1cb9..b4105152f 100755 --- a/processing/setup/setup_processing.py +++ b/processing/setup/setup_processing.py @@ -105,7 +105,7 @@ bin_link = { \ 'mentat_colorMap.py', 'postResults.py', 'spectral_iterationCount.py', - 'spectral_convergence.py', + 'spectral_parseLog.py', ], }