improved warning in case the core module is not found, corrected '/echo/' handling (had problems with key 'c/a'

This commit is contained in:
Martin Diehl 2015-03-15 15:24:45 +00:00
parent df2ee87a7c
commit dd5055dc19
2 changed files with 2 additions and 2 deletions

View File

@ -54,5 +54,5 @@ except (ImportError,AttributeError) as e:
'compile_CoreModule.py', 'compile_CoreModule.py',
): ):
sys.stderr.write('\nWARNING: Core module (Fortran code) not available, \n'\ sys.stderr.write('\nWARNING: Core module (Fortran code) not available, \n'\
'try to run setup_processing.sh or compile_CoreModule.py\n'\ "try to run 'make processing'\n"\
'Error message when importing core.so: %s\n\n'%e) 'Error message when importing core.so: %s\n\n'%e)

View File

@ -148,7 +148,7 @@ class Material():
for line in content: for line in content:
line = line.split('#')[0].strip() # kill comments and extra whitespace line = line.split('#')[0].strip() # kill comments and extra whitespace
line = line.split('/')[0].strip() # kill comments and extra whitespace line = line.split('/echo/')[0].strip() # remove '/echo/' tags
line = line.lower() # be case insensitive line = line.lower() # be case insensitive
if line: # content survives... if line: # content survives...
match_part = re_part.match(line) match_part = re_part.match(line)