From 80465c0b496096717d702d77e8a0b2ef4ebf26a6 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 4 Oct 2012 14:22:39 +0000 Subject: [PATCH] moved option for UTF-8 encoding to spectral interface as this is now called before prec init. if UTF-8 encoding is needed for FEM solver (old compilers might not support it), add the same statement to the corresponding interface routine --- code/DAMASK_spectral_interface.f90 | 3 ++- code/prec.f90 | 6 +----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/code/DAMASK_spectral_interface.f90 b/code/DAMASK_spectral_interface.f90 index c6f8adec4..2194b4337 100644 --- a/code/DAMASK_spectral_interface.f90 +++ b/code/DAMASK_spectral_interface.f90 @@ -82,7 +82,8 @@ subroutine DAMASK_interface_init(loadCaseParameterIn,geometryParameterIn) logical :: & gotLoadCase = .false., & gotGeometry = .false. - + + open(6, encoding='UTF-8') ! modern fortran compilers (gfortran >4.4, ifort >11 support it) write(6,'(a)') '' write(6,'(a)') ' <<<+- DAMASK_spectral_interface init -+>>>' write(6,'(a)') ' $Id$' diff --git a/code/prec.f90 b/code/prec.f90 index 8101df841..4836b557f 100644 --- a/code/prec.f90 +++ b/code/prec.f90 @@ -94,12 +94,8 @@ subroutine prec_init write(6,'(a,i3)') ' Bytes for pLongInt: ',pLongInt write(6,'(a,e10.3)') ' NaN: ', DAMASK_NaN write(6,'(a,l3)') ' NaN /= NaN: ',DAMASK_NaN/=DAMASK_NaN - if (DAMASK_NaN == DAMASK_NaN) call quit(9000) -#ifdef Spectral - open(6, encoding='UTF-8') ! modern fortran compilers (gfortran >4.4, ifort >11 support it) - write(6,*) 'using UTF-8 coded output' -#endif write(6,*) + if (DAMASK_NaN == DAMASK_NaN) call quit(9000) !$OMP END CRITICAL (write2out) end subroutine prec_init