From 78eb6dae1bd5db6a9484d035911a54cd970786a2 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Mon, 16 Mar 2015 14:50:57 +0100 Subject: [PATCH] Fixed -a -m -d --- Makefile | 2 +- src/command_line.py | 1 + src/cython_setup.py | 2 +- src/irp_stack.py | 10 +++++----- src/version.py | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 97732c1..9456ea8 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ src: $(MAKE) -C $@ man: - - $(MAKE) -C $@ + - $(MAKE) -C $@ &> /dev/null all: src man diff --git a/src/command_line.py b/src/command_line.py index d55515d..59e3185 100644 --- a/src/command_line.py +++ b/src/command_line.py @@ -256,6 +256,7 @@ def print_options(): description = p1.communicate(description)[0] description = description.replace('\n','\n'.ljust(27)) print ("-%s, --%s"%(k,options[k][0])).ljust(25), description+'\n' + print "\n" if __name__ == '__main__': print_options() diff --git a/src/cython_setup.py b/src/cython_setup.py index ae6b6a3..6bb2e85 100755 --- a/src/cython_setup.py +++ b/src/cython_setup.py @@ -29,7 +29,7 @@ from distutils.extension import Extension from Cython.Distutils import build_ext import os -to_remove = """cython_setup.py command_line.py""".split() +to_remove = """cython_setup.py version.py command_line.py""".split() ext_modules = [] files = os.listdir('.') diff --git a/src/irp_stack.py b/src/irp_stack.py index ce238d8..036f96a 100644 --- a/src/irp_stack.py +++ b/src/irp_stack.py @@ -146,11 +146,11 @@ end subroutine endif stack_index(ithread+1) = mod(stack_index(ithread+1)+1,STACKMAX) irp_stack(stack_index(ithread+1),ithread+1) = irp_where""") - if command_line.do_memory: - txt+=""" - print *, 'Allocating irp_stack(',STACKMAX,','nthread,')' - print *, 'Allocating irp_cpu(',STACKMAX,','nthread,')' - print *, 'Allocating stack_index(',nthread,')'""" +# if command_line.do_memory: +# txt+=""" +# print *, 'Allocating irp_stack(',STACKMAX,','nthread,')' +# print *, 'Allocating irp_cpu(',STACKMAX,','nthread,')' +# print *, 'Allocating stack_index(',nthread,')'""" else: txt = txt.replace("$1","") diff --git a/src/version.py b/src/version.py index e3a0f01..0c46db4 100644 --- a/src/version.py +++ b/src/version.py @@ -1 +1 @@ -version = "1.5.0" +version = "1.5.1"