From 380a536b4555a498df1987cf07abacf845c57d23 Mon Sep 17 00:00:00 2001
From: Martin	Diehl <m.diehl@mpie.de>
Date: Fri, 26 Aug 2011 13:57:29 +0000
Subject: [PATCH] homogenization_*, constitutive_*, DAMASK_spectral_interface:
 did some polishing regarding init output makefile: corrected spelling mistake

---
 code/DAMASK_spectral_interface.f90  | 2 +-
 code/constitutive_dislotwin.f90     | 2 +-
 code/constitutive_j2.f90            | 2 +-
 code/constitutive_nonlocal.f90      | 2 +-
 code/constitutive_phenopowerlaw.f90 | 2 +-
 code/constitutive_titanmod.f90      | 2 +-
 code/homogenization_RGC.f90         | 2 +-
 code/homogenization_isostrain.f90   | 2 +-
 code/makefile                       | 4 ++--
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/code/DAMASK_spectral_interface.f90 b/code/DAMASK_spectral_interface.f90
index 34a84d540..fba46e91c 100644
--- a/code/DAMASK_spectral_interface.f90
+++ b/code/DAMASK_spectral_interface.f90
@@ -35,7 +35,7 @@ CONTAINS
 subroutine DAMASK_interface_init()
 
  write(6,*)
- write(6,*) '<<<+-  DAMASK_spectral init  -+>>>'
+ write(6,*) '<<<+-  DAMASK_spectral_interface init  -+>>>'
  write(6,*) '$Id$'
  write(6,*)
 
diff --git a/code/constitutive_dislotwin.f90 b/code/constitutive_dislotwin.f90
index 0db1ff337..df285adf0 100644
--- a/code/constitutive_dislotwin.f90
+++ b/code/constitutive_dislotwin.f90
@@ -143,7 +143,7 @@ character(len=1024) line
 
 !$OMP CRITICAL (write2out)
   write(6,*)
-  write(6,'(a20,a20,a12)') '<<<+-  constitutive_',constitutive_dislotwin_label,' init  -+>>>'
+  write(6,*) '<<<+-  constitutive_',trim(constitutive_dislotwin_label),' init  -+>>>'
   write(6,*) '$Id$'
   write(6,*)
 !$OMP END CRITICAL (write2out)
diff --git a/code/constitutive_j2.f90 b/code/constitutive_j2.f90
index 426198b04..06f91e445 100644
--- a/code/constitutive_j2.f90
+++ b/code/constitutive_j2.f90
@@ -97,7 +97,7 @@ subroutine constitutive_j2_init(file)
 
  !$OMP CRITICAL (write2out)
    write(6,*)
-   write(6,'(a20,a20,a12)') '<<<+-  constitutive_',constitutive_j2_label,' init  -+>>>'
+   write(6,*) '<<<+-  constitutive_',trim(constitutive_j2_label),' init  -+>>>'
    write(6,*) '$Id$'
    write(6,*)
  !$OMP END CRITICAL (write2out)
diff --git a/code/constitutive_nonlocal.f90 b/code/constitutive_nonlocal.f90
index d258c8a26..40c9012fc 100644
--- a/code/constitutive_nonlocal.f90
+++ b/code/constitutive_nonlocal.f90
@@ -195,7 +195,7 @@ character(len=1024)                         line
 
 !$OMP CRITICAL (write2out)
   write(6,*)
-  write(6,'(a20,a20,a12)') '<<<+-  constitutive_',constitutive_nonlocal_label,' init  -+>>>'
+  write(6,*) '<<<+-  constitutive_',trim(constitutive_nonlocal_label),' init  -+>>>'
   write(6,*) '$Id$'
   write(6,*)
 !$OMP END CRITICAL (write2out)
diff --git a/code/constitutive_phenopowerlaw.f90 b/code/constitutive_phenopowerlaw.f90
index 6b41d6c01..024fd1a1c 100644
--- a/code/constitutive_phenopowerlaw.f90
+++ b/code/constitutive_phenopowerlaw.f90
@@ -172,7 +172,7 @@ subroutine constitutive_phenopowerlaw_init(file)
 
  !$OMP CRITICAL (write2out)
    write(6,*)
-   write(6,'(a20,a20,a12)') '<<<+-  constitutive_',constitutive_phenopowerlaw_label,' init  -+>>>'
+   write(6,*) '<<<+-  constitutive_',trim(constitutive_phenopowerlaw_label),' init  -+>>>'
    write(6,*) '$Id$'
    write(6,*)
  !$OMP END CRITICAL (write2out)
diff --git a/code/constitutive_titanmod.f90 b/code/constitutive_titanmod.f90
index 32dbafd20..6be59094f 100644
--- a/code/constitutive_titanmod.f90
+++ b/code/constitutive_titanmod.f90
@@ -219,7 +219,7 @@ character(len=64) tag
 character(len=1024) line
 
 write(6,*)
-write(6,'(a20,a20,a12)') '<<<+-  constitutive_',constitutive_titanmod_label,' init  -+>>>'
+write(6,*) '<<<+-  constitutive_',trim(constitutive_titanmod_label),' init  -+>>>'
 write(6,*) '$Id$'
 write(6,*)
 
diff --git a/code/homogenization_RGC.f90 b/code/homogenization_RGC.f90
index 9d31dce00..4fc827451 100644
--- a/code/homogenization_RGC.f90
+++ b/code/homogenization_RGC.f90
@@ -81,7 +81,7 @@ subroutine homogenization_RGC_init(&
 
 !$OMP CRITICAL (write2out)
    write(6,*)
-   write(6,'(a21,a20,a12)') '<<<+-  homogenization',homogenization_RGC_label,' init  -+>>>'
+   write(6,*) '<<<+-  homogenization_',trim(homogenization_RGC_label),' init  -+>>>'
    write(6,*) '$Id$'
    write(6,*)
 !$OMP END CRITICAL (write2out)
diff --git a/code/homogenization_isostrain.f90 b/code/homogenization_isostrain.f90
index 70d63076d..76d7d4628 100644
--- a/code/homogenization_isostrain.f90
+++ b/code/homogenization_isostrain.f90
@@ -75,7 +75,7 @@ subroutine homogenization_isostrain_init(&
  
  !$OMP CRITICAL (write2out)
    write(6,*)
-   write(6,'(a21,a20,a12)') '<<<+-  homogenization',homogenization_isostrain_label,' init  -+>>>'
+   write(6,*) '<<<+-  homogenization_',trim(homogenization_isostrain_label),' init  -+>>>'
    write(6,*) '$Id$'
    write(6,*)
  !$OMP END CRITICAL (write2out)
diff --git a/code/makefile b/code/makefile
index 4cd269c0f..8e8c3639b 100644
--- a/code/makefile
+++ b/code/makefile
@@ -18,7 +18,7 @@
 # PORTABLE = TRUE (FALSE): decision, if executable is optimized for the machine on which it was built
 # OPTIMIZATION = DEFENSIVE (OFF,AGGRESSIVE): Optimization mode, O0, O2, O3
 # OPENMP = TRUE (FALSE): OpenMP multiprocessor support
-# AMCL = FALSE (TRUE): link with AMD math core library (v. 4.4 need to be installed)
+# ACML = OFF (ON): link with AMD math core library (v. 4.4 need to be installed)
 
 ifeq ($(F90), )
 F90 =ifort
@@ -48,7 +48,7 @@ OPENMP_FLAG_gfortran =-fopenmp
 OPENMP =ON
 endif
 
-ifeq ($(AMCL), ON)
+ifeq ($(ACML), ON)
 BLAS_ON_ifort =-L /opt/acml4.4.0/ifort64_mp/lib -lacml_mp
 BLAS_OFF_ifort =-L /opt/acml4.4.0/ifort64/lib -lacml
 BLAS_ON_gfortran =