diff --git a/src/preprocessed_text.py b/src/preprocessed_text.py index cb92b13..e6d5b48 100644 --- a/src/preprocessed_text.py +++ b/src/preprocessed_text.py @@ -858,7 +858,7 @@ preprocessed_text = parallel_loop( lambda x,y: create_preprocessed_text(x), \ ###################################################################### def debug(): for filename, txt in preprocessed_text: - if filename == 'jastrow_large.irp.f': + if filename == 'invert.irp.f': print "=== "+filename+" ===" for line in txt: print line diff --git a/src/variable.py b/src/variable.py index bd7a6dc..e07f2d5 100644 --- a/src/variable.py +++ b/src/variable.py @@ -465,13 +465,9 @@ class Variable(object): result = " allocate(%s(%s),stat=irp_err)" result = result%(name,','.join(self.dim)) if command_line.do_memory: - tmp = "\n print *, %s, 'Allocating %s(%s), (',%s,')'" + tmp = "\n print *, %s, 'Allocating %s(%s)'" d = ','.join(self.dim) - d2 = '*'.join(self.dim) - if ":" in d: - result += tmp%('-1',name,d,"''") - else: - result += tmp%(d2,name,d,d) + result += tmp%('size('+name+')',name,d) return result result = [ " if (allocated (%s) ) then"%(name) ]