removed debug statement in averageDown.py, deleted obsolete spectral_iterationCount.py (new solver will report statistics anyway and most probably the current count does not work as the screen output was modified)

processing/post/averageDown.py

@@ -144,7 +144,6 @@ for file in files:
 # ------------------------------------------ process data ---------------------------------------  
   table.data_rewind()
   data = numpy.zeros(outSize.tolist()+[len(table.labels)])
-  print numpy.shape(data)
   p = numpy.zeros(3,'i')
   
   for p[2] in xrange(resolution[2]):

processing/post/spectral_iterationCount.py

@@ -1,107 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: UTF-8 no BOM -*-
-
-import os,sys,string,re
-from optparse import OptionParser, OptionGroup, Option, SUPPRESS_HELP
-
-# -----------------------------
-class extendedOption(Option):
-# -----------------------------
-# used for definition of new option parser action 'extend', which enables to take multiple option arguments
-# taken from online tutorial http://docs.python.org/library/optparse.html
-    
-    ACTIONS = Option.ACTIONS + ("extend",)
-    STORE_ACTIONS = Option.STORE_ACTIONS + ("extend",)
-    TYPED_ACTIONS = Option.TYPED_ACTIONS + ("extend",)
-    ALWAYS_TYPED_ACTIONS = Option.ALWAYS_TYPED_ACTIONS + ("extend",)
-
-    def take_action(self, action, dest, opt, value, values, parser):
-        if action == "extend":
-            lvalue = value.split(",")
-            values.ensure_value(dest, []).extend(lvalue)
-        else:
-            Option.take_action(self, action, dest, opt, value, values, parser)
-
-
-
-# ----------------------- MAIN -------------------------------
-
-parser = OptionParser(option_class=extendedOption, usage='%prog [options] spectralOut[s]', description = """
-Generate datafile of converged iteration per increment.
-
-""" + string.replace('$Id$','\n','\\n')
-)
-
-parser.add_option('-m','--memory',      dest='memory', action='store_true', \
-                                        help='load complete file into memory [%default]')
-
-parser.set_defaults(memory = False)
-
-(options, filenames) = parser.parse_args()
-
-# ------------------------------------------ setup file handles ---------------------------------------  
-
-files = []
-if filenames == []:
-  files.append({'name':'STDIN', 'input':sys.stdin, 'output':sys.stdout})
-else:
-  for name in filenames:
-    if os.path.exists(name):
-      (head,tail) = os.path.split(name)
-      files.append({'name':name, 'input':open(name), 
-                                'output':open(os.path.join(head,'iterationCount_'+os.path.splitext(tail)[0]+'.txt'), 'w')})
-
-
-# ------------------------------------------ loop over input files ---------------------------------------  
-
-for file in files:
-  print file['name']
-
-# ------------------------------------------ assemble header ---------------------------------------  
-
-  output = '1\theader\n' + \
-           '\t'.join(['increment','loadcase','step','iterations']) + '\n'
-
-  if options.memory:
-    data = file['input'].readlines()
-  else:
-    data = []
-    file['output'].write(output)
-    output = ''
-  
-# ------------------------------------------ read file ---------------------------------------  
-
-  pattern = re.compile('Loadcase\s+(\d+)\s+Increment\s+(\d+)/\d+\s+@\s+Iteration\s+(\d+)/\d+.*')
-  lastLoadcase = 0
-  lastStep = 0
-  lastIteration = 0
-  theIncrement = 1
-
-  for line in {True  : data,
-               False : file['input']}[options.memory]:
-
-    m = re.match(pattern, line)
-    if m:
-      thisLoadcase  = int(m.group(1))
-      thisStep      = int(m.group(2))
-      thisIteration = int(m.group(3))
-      if thisIteration <= lastIteration:                                          # indicator for new increment or loadcase
-        output += '\t'.join(map(str,[theIncrement,lastLoadcase,lastStep,lastIteration])) + '\n'
-        theIncrement += 1
-        if not options.memory:
-          file['output'].write(output)
-          output = ''
-      lastLoadcase  = thisLoadcase
-      lastStep      = thisStep
-      lastIteration = thisIteration
-  
-  output += '\t'.join(map(str,[theIncrement,lastLoadcase,lastStep,lastIteration])) + '\n' # process last iteration (for which, of course, no further iteration can be found)
-  
-  file['input'].close()
-
-# ------------------------------------------ output result ---------------------------------------  
-
-  file['output'].write(output)
-
-  if file['name'] != 'STDIN':
-    file['output'].close