From eeac38dd1a82a4c34ef1b55f4db8e436c46c2748 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 13 Oct 2014 08:44:49 +0000 Subject: [PATCH] polishing --- code/FEsolving.f90 | 14 +++++--------- code/IO.f90 | 6 +++--- code/math.f90 | 19 +++++++------------ 3 files changed, 15 insertions(+), 24 deletions(-) diff --git a/code/FEsolving.f90 b/code/FEsolving.f90 index 590bb8a65..092e0781b 100644 --- a/code/FEsolving.f90 +++ b/code/FEsolving.f90 @@ -66,11 +66,9 @@ subroutine FE_init IO_stringValue, & IO_intValue, & IO_lc, & -#ifndef Spectral -#ifndef FEM +#if defined(Marc4DAMASK) || defined(Abaqus) IO_open_inputFile, & IO_open_logFile, & -#endif #endif IO_warning, & IO_timeStamp @@ -79,8 +77,7 @@ subroutine FE_init worldrank implicit none -#ifndef Spectral -#ifndef FEM +#if defined(Marc4DAMASK) || defined(Abaqus) integer(pInt), parameter :: & FILEUNIT = 222_pInt, & maxNchunks = 6_pInt @@ -88,13 +85,12 @@ subroutine FE_init character(len=64) :: tag character(len=1024) :: line integer(pInt), dimension(1_pInt+2_pInt*maxNchunks) :: positions -#endif #endif mainProcess: if (worldrank == 0) then - write(6,'(/,a)') ' <<<+- FEsolving init -+>>>' - write(6,'(a)') ' $Id$' - write(6,'(a15,a)') ' Current time: ',IO_timeStamp() + write(6,'(/,a)') ' <<<+- FEsolving init -+>>>' + write(6,'(a)') ' $Id$' + write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" endif mainProcess diff --git a/code/IO.f90 b/code/IO.f90 index 0055c2d27..51d0a60f3 100644 --- a/code/IO.f90 +++ b/code/IO.f90 @@ -115,9 +115,9 @@ subroutine IO_init #endif mainProcess: if (worldrank == 0) then - write(6,'(/,a)') ' <<<+- IO init -+>>>' - write(6,'(a)') ' $Id$' - write(6,'(a15,a)') ' Current time: ',IO_timeStamp() + write(6,'(/,a)') ' <<<+- IO init -+>>>' + write(6,'(a)') ' $Id$' + write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" endif mainProcess diff --git a/code/math.f90 b/code/math.f90 index 9f9328c9a..566ca33b0 100644 --- a/code/math.f90 +++ b/code/math.f90 @@ -250,18 +250,13 @@ subroutine math_init call random_number(randTest(i)) enddo -#ifdef FEM - if (worldrank == 0) then -#endif - write(6,*) 'size of random seed: ', randSize - do i =1, randSize - write(6,*) 'value of random seed: ', i, randInit(i) - enddo - write(6,'(a,4(/,26x,f17.14))') ' start of random sequence: ', randTest - write(6,*) '' -#ifdef FEM - endif -#endif + mainProcess2: if (worldrank == 0) then + write(6,*) 'size of random seed: ', randSize + do i =1, randSize + write(6,*) 'value of random seed: ', i, randInit(i) + enddo + write(6,'(a,4(/,26x,f17.14),/)') ' start of random sequence: ', randTest + endif mainProcess2 call random_seed(put = randInit)