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

utf8 encoding output to screen now for all solvers using intel ifort>10 or any gfortran (old versions might not support it, but we don't use them anyway)

This commit is contained in:
Martin Diehl 2012-04-28 10:46:41 +00:00
parent dbeac18df6
commit 26c6063a2c
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/DAMASK_spectral_interface.f90
View File

@ -67,7 +67,6 @@ subroutine DAMASK_interface_init(loadcaseParameterIn,geometryParameterIn)
length length
integer, dimension(8) :: & integer, dimension(8) :: &
dateAndTime ! type default integer dateAndTime ! type default integer
open (6, encoding='UTF-8')
write(6,'(a)') '' write(6,'(a)') ''
write(6,'(a)') '<<<+- DAMASK_spectral_interface init -+>>>' write(6,'(a)') '<<<+- DAMASK_spectral_interface init -+>>>'
write(6,'(a)') '$Id$' write(6,'(a)') '$Id$'

16
code/prec.f90
View File

@ -19,6 +19,12 @@
!############################################################## !##############################################################
!* $Id$ !* $Id$
!############################################################## !##############################################################
#ifdef __INTEL_COMPILER
#if __INTEL_COMPILER<1200
#define LEGACY_COMPILER
#endif
#endif
module prec module prec
!############################################################## !##############################################################
@ -34,12 +40,8 @@ module prec
! NaN is precision dependent ! NaN is precision dependent
! from http://www.hpc.unimelb.edu.au/doc/f90lrm/dfum_035.html ! from http://www.hpc.unimelb.edu.au/doc/f90lrm/dfum_035.html
! copy can be found in documentation/Code/Fortran ! copy can be found in documentation/Code/Fortran
#ifdef __INTEL_COMPILER #ifdef LEGACY_COMPILER
#if __INTEL_COMPILER<1200
real(pReal), parameter, public :: DAMASK_NaN = Z'7FF0000000000001' real(pReal), parameter, public :: DAMASK_NaN = Z'7FF0000000000001'
#else
real(pReal), parameter, public :: DAMASK_NaN = real(Z'7FF0000000000001', pReal)
#endif
#else #else
real(pReal), parameter, public :: DAMASK_NaN = real(Z'7FF0000000000001', pReal) real(pReal), parameter, public :: DAMASK_NaN = real(Z'7FF0000000000001', pReal)
#endif #endif
@ -58,6 +60,10 @@ subroutine prec_init
implicit none implicit none
!$OMP CRITICAL (write2out) !$OMP CRITICAL (write2out)
#ifndef LEGACY_COMPILER
open (6, encoding='UTF-8')
#endif
write(6,*) write(6,*)
write(6,*) '<<<+- prec init -+>>>' write(6,*) '<<<+- prec init -+>>>'
write(6,*) '$Id$' write(6,*) '$Id$'

16
code/prec_single.f90
View File

@ -19,6 +19,12 @@
!############################################################## !##############################################################
!* $Id$ !* $Id$
!############################################################## !##############################################################
#ifdef __INTEL_COMPILER
#if __INTEL_COMPILER<1200
#define LEGACY_COMPILER
#endif
#endif
module prec module prec
!############################################################## !##############################################################
@ -34,12 +40,8 @@ module prec
! NaN is precision dependent ! NaN is precision dependent
! from http://www.hpc.unimelb.edu.au/doc/f90lrm/dfum_035.html ! from http://www.hpc.unimelb.edu.au/doc/f90lrm/dfum_035.html
! copy can be found in documentation/Code/Fortran ! copy can be found in documentation/Code/Fortran
#ifdef __INTEL_COMPILER #ifdef LEGACY_COMPILER
#if __INTEL_COMPILER<1200
real(pReal), parameter, public :: DAMASK_NaN = Z'Z'7F800001', pReal' real(pReal), parameter, public :: DAMASK_NaN = Z'Z'7F800001', pReal'
#else
real(pReal), parameter, public :: DAMASK_NaN = real(Z'7F800001', pReal)
#endif
#else #else
real(pReal), parameter, public :: DAMASK_NaN = real(Z'7F800001', pReal) real(pReal), parameter, public :: DAMASK_NaN = real(Z'7F800001', pReal)
#endif #endif
@ -58,6 +60,10 @@ subroutine prec_init
implicit none implicit none
!$OMP CRITICAL (write2out) !$OMP CRITICAL (write2out)
#ifndef LEGACY_COMPILER
open (6, encoding='UTF-8')
#endif
write(6,*) write(6,*)
write(6,*) '<<<+- prec_single init -+>>>' write(6,*) '<<<+- prec_single init -+>>>'
write(6,*) '$Id$' write(6,*) '$Id$'