From 302178ebb405567f506d4b28c4d9819eabc84eb0 Mon Sep 17 00:00:00 2001
From: Martin	Diehl <m.diehl@mpie.de>
Date: Sat, 14 Nov 2015 09:47:18 +0000
Subject: [PATCH] some trouble since clean was already in PETSc rules

---
 Makefile                      |  2 +-
 code/Makefile                 | 19 ++++++++++++-------
 processing/pre/geom_rotate.py |  6 +++---
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 18ae91a1d..8be738090 100755
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ tidy:
 
 .PHONY: clean
 clean:
-	@$(MAKE) clean -C code >/dev/null
+	@$(MAKE) cleanDAMASK -C code >/dev/null
 
 .PHONY: install
 install:
diff --git a/code/Makefile b/code/Makefile
index 2529f2a17..a31658cad 100644
--- a/code/Makefile
+++ b/code/Makefile
@@ -658,19 +658,24 @@ endif
 tidy:
 	@rm -rf *.o
 	@rm -rf *.mod
-
-.PHONY: clean
-clean:
-	@rm -rf *.o
-	@rm -rf *.mod
-	@rm -rf *.exe
-	@rm -rf *.marc
 	@rm -rf *.inst.f90  # for instrumentation
 	@rm -rf *.pomp.f90  # for instrumentation
 	@rm -rf *.pp.f90    # for instrumentation
 	@rm -rf *.pdb       # for instrumnentation
 	@rm -rf *.opari.inc # for instrumnentation
 
+.PHONY: cleanDAMASK
+cleanDAMASK:
+	@rm -rf *.exe
+	@rm -rf *.marc
+	@rm -rf *.o
+	@rm -rf *.mod
+	@rm -rf *.inst.f90  # for instrumentation
+	@rm -rf *.pomp.f90  # for instrumentation
+	@rm -rf *.pp.f90    # for instrumentation
+	@rm -rf *.pdb       # for instrumentation
+	@rm -rf *.opari.inc # for instrumentation
+
 .PHONY: help
 help:
 	F90="$(F90)"
diff --git a/processing/pre/geom_rotate.py b/processing/pre/geom_rotate.py
index 8c451a901..da58f81c3 100755
--- a/processing/pre/geom_rotate.py
+++ b/processing/pre/geom_rotate.py
@@ -96,9 +96,9 @@ for name in filenames:
   microstructure = table.microstructure_read(info['grid']).reshape(info['grid'],order='F')                    # read microstructure
 
   newGrainID = options.fill if options.fill > 0 else microstructure.max()+1
-  microstructure = ndimage.rotate(microstructure,eulers[2],(0,1),order=0,output=np.dtype(int),cval=newGrainID) # rotation around Z
-  microstructure = ndimage.rotate(microstructure,eulers[1],(1,2),order=0,output=np.dtype(int),cval=newGrainID) # rotation around X
-  microstructure = ndimage.rotate(microstructure,eulers[0],(0,1),order=0,output=np.dtype(int),cval=newGrainID) # rotation around Z
+  microstructure = ndimage.rotate(microstructure,eulers[2],(0,1),order=0,output=int,cval=newGrainID) # rotation around Z
+  microstructure = ndimage.rotate(microstructure,eulers[1],(1,2),order=0,output=int,cval=newGrainID) # rotation around X
+  microstructure = ndimage.rotate(microstructure,eulers[0],(0,1),order=0,output=int,cval=newGrainID) # rotation around Z
 
 # --- do work ------------------------------------------------------------------------------------