From 30bb28894b04d995ad717fef8a2410a8abeeed46 Mon Sep 17 00:00:00 2001
From: Anthony Scemama <scemama@irsamc.ups-tlse.fr>
Date: Fri, 17 Mar 2017 10:23:28 +0100
Subject: [PATCH] Broken irp_stack

---
 src/build_file.py |  1 -
 src/irp_stack.py  | 18 +++++++++---------
 src/irpf90.py     |  3 +++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/build_file.py b/src/build_file.py
index 48b5c54..b3aad23 100644
--- a/src/build_file.py
+++ b/src/build_file.py
@@ -319,7 +319,6 @@ def create_makefile(d_flags,d_var,irpf90_flags,ninja=True):
               "\tIRPF90FLAGS += -j",
               "else ifeq ($(BUILD_SYSTEM),make)",
               "\tBUILD_FILE=IRPF90_temp/build.make",
-              "\tBUILD_SYSTEM += -j",
               "else",
               "DUMMY:",
               "\t$(error 'Wrong BUILD_SYSTEM: $(BUILD_SYSTEM)')",
diff --git a/src/irp_stack.py b/src/irp_stack.py
index fe321bc..f168176 100644
--- a/src/irp_stack.py
+++ b/src/irp_stack.py
@@ -85,9 +85,9 @@ subroutine irp_enter(irp_where)
  nthread = 1
  """
      txt += """
-   print *, 'Allocating irp_stack(',STACKMAX,',',0:nthread,')'
-   print *, 'Allocating irp_cpu(',STACKMAX,',',0:nthread,')'
-   print *, 'Allocating stack_index(',0:nthread,')'
+   print *, 'Allocating irp_stack(' , STACKMAX , ',0:', nthread, ')'
+   print *, 'Allocating irp_cpu(' , STACKMAX , ',0:', nthread , ')'
+   print *, 'Allocating stack_index(0:', nthread, ')'
  endif"""
   txt +="""
 $2
@@ -128,9 +128,9 @@ $1
   nthread = 1
 """
     txt +="""
-  print *, 'Allocating irp_stack(',STACKMAX,',',0:nthread,')'
-  print *, 'Allocating irp_cpu(',STACKMAX,',',0:nthread,')'
-  print *, 'Allocating stack_index(',0:nthread,')'
+  print *, 'Allocating irp_stack(',STACKMAX,',0:',nthread,')'
+  print *, 'Allocating irp_cpu(',STACKMAX,',0:',nthread,')'
+  print *, 'Allocating stack_index(0:',nthread,')'
  endif
 """
   txt += """
@@ -197,9 +197,9 @@ end subroutine
  irp_stack(stack_index(1),1) = irp_where"""
     if do_memory:
       txt+="""
-  print *, 'Allocating irp_stack(',STACKMAX,','0:nthread,')'
-  print *, 'Allocating irp_cpu(',STACKMAX,','0:nthread,')'
-  print *, 'Allocating stack_index(',0:nthread,')'"""
+  print *, 'Allocating irp_stack(',STACKMAX,'0:',nthread,')'
+  print *, 'Allocating irp_cpu(',STACKMAX,'0:',nthread,')'
+  print *, 'Allocating stack_index(0:',nthread,')'"""
   else:
     s = ""
   txt = txt.replace("$1",s)
diff --git a/src/irpf90.py b/src/irpf90.py
index a075cc4..213e63d 100644
--- a/src/irpf90.py
+++ b/src/irpf90.py
@@ -91,6 +91,9 @@ def main():
     if not command_line.do_run:
         return
 
+    import irp_stack
+    irp_stack.create()
+
     comm_world.create_buildfile(command_line.do_ninja)
     comm_world.write_modules()