223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

homogenization_*, constitutive_*, DAMASK_spectral_interface: did some polishing regarding init output 

makefile: corrected spelling mistake
This commit is contained in:
Martin Diehl 2011-08-26 13:57:29 +00:00
parent 4eb8e25b6d
commit 380a536b45
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/DAMASK_spectral_interface.f90
View File

@ -35,7 +35,7 @@ CONTAINS
subroutine DAMASK_interface_init() subroutine DAMASK_interface_init()
write(6,*) write(6,*)
write(6,*) '<<<+- DAMASK_spectral init -+>>>' write(6,*) '<<<+- DAMASK_spectral_interface init -+>>>'
write(6,*) '$Id$' write(6,*) '$Id$'
write(6,*) write(6,*)

2
code/constitutive_dislotwin.f90
View File

@ -143,7 +143,7 @@ character(len=1024) line
!$OMP CRITICAL (write2out) !$OMP CRITICAL (write2out)
write(6,*) 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,*) '$Id$'
write(6,*) write(6,*)
!$OMP END CRITICAL (write2out) !$OMP END CRITICAL (write2out)

2
code/constitutive_j2.f90
View File

@ -97,7 +97,7 @@ subroutine constitutive_j2_init(file)
!$OMP CRITICAL (write2out) !$OMP CRITICAL (write2out)
write(6,*) 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,*) '$Id$'
write(6,*) write(6,*)
!$OMP END CRITICAL (write2out) !$OMP END CRITICAL (write2out)

2
code/constitutive_nonlocal.f90
View File

@ -195,7 +195,7 @@ character(len=1024) line
!$OMP CRITICAL (write2out) !$OMP CRITICAL (write2out)
write(6,*) 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,*) '$Id$'
write(6,*) write(6,*)
!$OMP END CRITICAL (write2out) !$OMP END CRITICAL (write2out)

2
code/constitutive_phenopowerlaw.f90
View File

@ -172,7 +172,7 @@ subroutine constitutive_phenopowerlaw_init(file)
!$OMP CRITICAL (write2out) !$OMP CRITICAL (write2out)
write(6,*) 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,*) '$Id$'
write(6,*) write(6,*)
!$OMP END CRITICAL (write2out) !$OMP END CRITICAL (write2out)

2
code/constitutive_titanmod.f90
View File

@ -219,7 +219,7 @@ character(len=64) tag
character(len=1024) line character(len=1024) line
write(6,*) 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,*) '$Id$'
write(6,*) write(6,*)

2
code/homogenization_RGC.f90
View File

@ -81,7 +81,7 @@ subroutine homogenization_RGC_init(&
!$OMP CRITICAL (write2out) !$OMP CRITICAL (write2out)
write(6,*) 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,*) '$Id$'
write(6,*) write(6,*)
!$OMP END CRITICAL (write2out) !$OMP END CRITICAL (write2out)

2
code/homogenization_isostrain.f90
View File

@ -75,7 +75,7 @@ subroutine homogenization_isostrain_init(&
!$OMP CRITICAL (write2out) !$OMP CRITICAL (write2out)
write(6,*) 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,*) '$Id$'
write(6,*) write(6,*)
!$OMP END CRITICAL (write2out) !$OMP END CRITICAL (write2out)

4
code/makefile
View File

@ -18,7 +18,7 @@
# PORTABLE = TRUE (FALSE): decision, if executable is optimized for the machine on which it was built # 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 # OPTIMIZATION = DEFENSIVE (OFF,AGGRESSIVE): Optimization mode, O0, O2, O3
# OPENMP = TRUE (FALSE): OpenMP multiprocessor support # 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), ) ifeq ($(F90), )
F90 =ifort F90 =ifort
@ -48,7 +48,7 @@ OPENMP_FLAG_gfortran =-fopenmp
OPENMP =ON OPENMP =ON
endif endif
ifeq ($(AMCL), ON) ifeq ($(ACML), ON)
BLAS_ON_ifort =-L /opt/acml4.4.0/ifort64_mp/lib -lacml_mp 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_OFF_ifort =-L /opt/acml4.4.0/ifort64/lib -lacml
BLAS_ON_gfortran = BLAS_ON_gfortran =